SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334863 )
Change subject: [WIP] Organize and cleanup CSS per coding conventions
......................................................................
[WIP] Organize and cleanup CSS per coding conventions
Bug: T154052
Change-Id: I4e51d30fba992c04c0d0769a7f1d6051c39c60b9
---
M FanBoxes.css
M SpecialFanBoxes.css
M extension.json
3 files changed, 103 insertions(+), 119 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes
refs/changes/63/334863/1
diff --git a/FanBoxes.css b/FanBoxes.css
index 18898d1..6ca84b9 100644
--- a/FanBoxes.css
+++ b/FanBoxes.css
@@ -6,80 +6,68 @@
}
#fanBoxLeftSideOutput {
- width: 45px;
- height: 57px;
+ border: 1px solid #000;
font-size: 20px;
text-align: center;
- padding: 3px 5px 3px 5px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-left: 1px #000000 solid;
- border-right: 1px #000000 solid;
+ width: 45px;
+ height: 57px;
+ padding: 3px 5px;
}
#fanBoxLeftSideContainer {
+ border: 1px solid #000;
+ text-align: center;
width: 55px;
height: 63px;
- text-align: center;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-left: 1px #000000 solid;
- border-right: 1px #000000 solid;
}
#fanBoxLeftSideOutput2 {
- width: 45px;
- height: 57px;
font-size: 20px;
text-align: center;
- padding: 3px 5px 3px 5px;
+ width: 45px;
+ height: 57px;
+ padding: 3px 5px;
}
#fanBoxRightSideOutput {
+ border: 1px solid #000;
+ border-left: 0;
+ font-size: 14px;
width: 202px;
height: 57px;
- font-size: 14px;
- padding: 3px 5px 3px 5px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-right: 1px #000000 solid;
+ padding: 3px 5px;
}
#fanBoxRightSideContainer {
+ border: 1px solid #000;
+ border-left: 0;
width: 212px;
height: 63px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-right: 1px #000000 solid;
}
#fanBoxRightSideOutput2 {
+ font-size: 14px;
width: 202px;
height: 57px;
- font-size: 14px;
- padding: 3px 5px 3px 5px;
+ padding: 3px 5px;
}
#fanBoxLeftSideOutputProfile {
- width: 35px;
- height: 52px;
+ border: 1px solid #000;
font-size: 20px;
text-align: center;
- padding: 0px 5px 0px 5px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-left: 1px #000000 solid;
- border-right: 1px #000000 solid;
+ width: 35px;
+ height: 52px;
+ padding: 0 5px;
}
#fanBoxRightSideOutputProfile {
+ border: 1px solid #000;
+ border-left: 0;
+ font-size: 14px;
width: 150px;
height: 52px;
- font-size: 14px;
- padding: 0px 5px 0px 5px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-right: 1px #000000 solid;
+ padding: 0 5px;
}
/* LinkFilter stuff */
@@ -89,24 +77,23 @@
}
.lr-right {
+ border-left: 1px solid #dcdcdc;
float: right;
- border-left: 1px solid #DCDCDC;
- float: right;
- padding: 0px 0px 0px 20px;
- margin: 0px 0px 20px 0px;
width: 40%;
+ padding: 0 0 0 20px;
+ margin: 0 0 20px 0;
}
/* End LinkFilter-related rules */
.fantag-image {
- margin: 0px 0px 24px 0px;
+ margin: 0 0 24px 0;
}
.fanbox-item {
width: 270px;
height: 100%;
- margin: 0px 0px 5px 0px;
+ margin: 0 0 5px 0;
}
.individual-fanbox {
@@ -120,25 +107,25 @@
}
.fanbox-pop-up-box {
- width: 258px;
- display: none;
- padding: 5px;
border: 1px solid #dcdcdc;
+ width: 258px;
height: 53px;
+ padding: 5px;
+ display: none;
}
.fanbox-pop-up-box-profile {
+ border: 1px solid #dcdcdc;
width: 201px;
height: 50px;
display: none;
- border: 1px solid #dcdcdc;
}
.fanBoxTableProfile {
- cursor: pointer;
+ line-height: 1;
width: 100%;
height: 100%;
- line-height: 1;
+ cursor: pointer;
}
.show-message-container {
@@ -170,86 +157,81 @@
}
a.perma {
- position: absolute;
- bottom: 0.3em;
right: 0.3em;
+ bottom: 0.3em;
+ position: absolute;
display: block;
z-index: 1;
}
.show-addremove-message {
- color: red;
- font-weight: bold;
+ border: 1px solid #000;
+ color: #ff0;
+ font-weight: 700;
text-align: center;
height: 63px;
width: 268px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-left: 1px #000000 solid;
- border-right: 1px #000000 solid;
}
.show-addremove-message-half {
- color: red;
- font-weight: bold;
+ border: 1px solid #000;
+ color: #ff0;
+ font-weight: 700;
text-align: center;
height: 43px;
width: 190px;
padding: 5px;
- border-bottom: 1px #000000 solid;
- border-top: 1px #000000 solid;
- border-left: 1px #000000 solid;
- border-right: 1px #000000 solid;
}
.show-individual-addremove-message {
- color: red;
- font-weight: bold;
- padding-top: 10px;
+ color: #ff0;
+ font-weight: 700;
+ padding: 10px 0 0 0;
}
.back-links {
- margin: 0px 0px 10px 0px;
+ margin: 0 0 10px 0;
}
.back-links a {
+ font-weight: 700;
text-decoration: none;
- font-weight: bold;
+
}
.fanbox-count {
- margin: 0px 0px 0px 0px;
+ margin: 0;
}
.page-nav a {
- font-weight: bold;
+ font-weight: 700;
}
.top-fanbox-num {
- font-weight: bold;
- font-size: 18px;
color: #dcdcdc;
+ font-weight: 700;
+ font-size: 18px;
width: 45px;
- padding: 5px 0px 0px 0px;
- margin: 0px 0px 0px 5px;
+ padding: 5px 0 0 0;
+ margin: 0 0 0 5px;
float: left;
}
.top-fanbox-users {
- font-size: 13px;
color: #797979;
+ font-size: 13px;
+ float: left;
height: 65px;
width: 100px;
- float: left;
}
.top-fanbox-creator {
- font-size: 13px;
color: #797979;
+ font-size: 13px;
+ float: left;
height: 65px;
width: 150px;
padding-left: 10px;
- float: left;
}
.centerheight {
@@ -264,29 +246,29 @@
.fanbox-nav {
float: right;
- margin: 10px 0px 0px 0px;
+ margin: 10px 0 0 0;
width: 200px;
padding: 5px;
}
.fanbox-nav h2 {
- font-size: 16px;
- color: #333333;
- padding: 0px 0px 3px 0px;
border-bottom: 1px solid #dcdcdc;
- margin: 0px 0px 10px 0px !important;
+ color: #333;
+ font-size: 16px;
+ padding: 0 0 3px 0;
+ margin: 0 0 10px 0 !important;
}
.fanbox-nav a {
- font-weight: bold;
+ font-weight: 700;
text-decoration: none;
}
.top-fanboxes {
float: left;
- margin: 10px 0px 0px 0px;
- position: relative;
+ margin: 10px 0 0 0;
overflow: hidden;
+ position: relative;
}
.top-fanbox-row {
@@ -299,7 +281,7 @@
}
.view-fanboxes-container {
- padding: 0px 0px 25px 0px;
+ padding: 0 0 25px 0;
position: relative;
}
@@ -309,10 +291,10 @@
}
.fa-item {
- border: 1px solid #D7DEE8;
+ border: 1px solid #d7dee8;
padding: 7px;
float: left;
- margin: 0px 15px 15px 0px;
+ margin: 0 15px 15px 0;
width: 350px;
}
@@ -329,28 +311,29 @@
}
.users-with-fanbox h2 {
- border-bottom: none;
- font-size: 14px;
- font-weight: bold;
+ border-bottom: 0;
color: #777;
+ font-size: 14px;
+ font-weight: 700;
+
margin: 0px 0 3px 0 !important;
padding: 0;
}
.users-with-fanbox-message {
font-size: 9px;
- margin: 0px 0px 5px;
+ margin: 0 0 5px;
}
.users-with-fanbox img {
+ background-color: #fff;
border: 1px solid #dcdcdc;
padding: 2px;
- background-color: #fff;
- margin: 0px 2px 0px;
+ margin: 0 2px 0;
}
.fanbox-right-text-message {
font-size: 10px !important;
- font-weight: normal;
- margin: 0px 0px 0px 10px;
-}
\ No newline at end of file
+ font-weight: 400;
+ margin: 0 0 0 10px;
+}
diff --git a/SpecialFanBoxes.css b/SpecialFanBoxes.css
index 6d1e674..d4b39ce 100644
--- a/SpecialFanBoxes.css
+++ b/SpecialFanBoxes.css
@@ -4,10 +4,10 @@
margin-bottom: 10px;
}
-.mw-body h3, .mw-body-primary h3 {
- margin-top: 5px;
- margin-bottom: 5px;
+.mw-body h3,
+.mw-body-primary h3 {
font-size: 14px;
+ margin: 5px 0;
}
.create-fanbox-title {
@@ -23,41 +23,42 @@
width: 550px;
}
-.mw-body h1, .mw-body-primary h1 {
+.mw-body h1,
+.mw-body-primary h1 {
font-size: 16px;
- margin: 10px 0px 10px 0px !important;
+ margin: 10px 0 !important;
border-bottom: none;
- font-weight: bold;
+ font-weight: 700;
}
table.fanBoxTable {
border: 0;
- border-collapse: collapse; /* cellspacing=0 equivalent */
+ border-collapse: collapse;
padding: 0;
}
#fanBoxLeftSideContainer table {
- border-collapse: collapse; /* cellspacing=0 equivalent */
+ border-collapse: collapse;
height: 55px;
width: 63px;
}
#fanBoxRightSideContainer table {
- border-collapse: collapse; /* cellspacing=0 equivalent */
+ border-collapse: collapse;
}
#addImage {
font-size: 9px;
- color: #285C98;
- cursor: pointer;
+ color: #285c98;
display: inline;
+ cursor: pointer;
}
#closeImage {
font-size: 9px;
- color: #285C98;
- cursor: pointer;
+ color: #285c98;
display: none;
+ cursor: pointer;
}
.create-fanbox-image {
@@ -65,8 +66,8 @@
}
#real-form {
- display: block;
height: auto;
+ display: block;
}
#countdownbox {
@@ -99,17 +100,17 @@
#add-colors-left {
width: 150px;
- margin: 0px 2px 0px 0px;
+ margin: 0 2px 0 0;
float: left;
}
#colorpickerholder {
- position: relative;
- padding: 6px;
- background-color: #eeeeee;
+ background-color: #eee;
+ float: left;
width: 370px;
height: 190px;
- float: left;
+ padding: 6px;
+ position: relative;
}
.categorytext {
@@ -123,6 +124,6 @@
}
#create-tagcloud span a {
- cursor: pointer;
text-decoration: underline;
+ cursor: pointer;
}
diff --git a/extension.json b/extension.json
index 51a8b2b..30031b3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "FanBoxes",
- "version": "3.2.4",
+ "version": "3.2.7",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/334863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e51d30fba992c04c0d0769a7f1d6051c39c60b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
