jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332083 )
Change subject: v2.4.3 - Clean up CSS for BlogPage
......................................................................
v2.4.3 - Clean up CSS for BlogPage
Also included other changes such as:
- Renaming files to coding conventions
Bug: T154048
Bug: T154050
Change-Id: I4e70459aee1614a8e04a908aa28c759568975d0b
---
M extension.json
R resources/css/ext.blogpage.articleshome.css
R resources/css/ext.blogpage.blogpage.css
R resources/css/ext.blogpage.createblogpost.css
R resources/js/ext.blogpage.createblogpost.js
5 files changed, 162 insertions(+), 162 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 0a81f29..1f4e2fc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "BlogPage",
- "version": "2.4.2",
+ "version": "2.4.3",
"author": [
"David Pean",
"Jack Phoenix"
@@ -96,19 +96,19 @@
},
"ResourceModules": {
"ext.blogPage": {
- "styles": "resources/css/BlogPage.css",
+ "styles": "resources/css/ext.blogpage.blogpage.css",
"position": "top"
},
"ext.blogPage.articlesHome": {
- "styles": "resources/css/ArticlesHome.css",
+ "styles": "resources/css/ext.blogpage.articleshome.css",
"position": "top"
},
"ext.blogPage.create.css": {
- "styles": "resources/css/CreateBlogPost.css",
+ "styles":
"resources/css/ext.blogpage.createblogpost.css",
"position": "top"
},
"ext.blogPage.create.js": {
- "scripts": "resources/js/CreateBlogPost.js",
+ "scripts":
"resources/js/ext.blogpage.createblogpost.js",
"messages": [
"blog-js-create-error-need-content",
"blog-js-create-error-need-title",
diff --git a/resources/css/ArticlesHome.css
b/resources/css/ext.blogpage.articleshome.css
similarity index 67%
rename from resources/css/ArticlesHome.css
rename to resources/css/ext.blogpage.articleshome.css
index 2f5d3ad..d1628eb 100644
--- a/resources/css/ArticlesHome.css
+++ b/resources/css/ext.blogpage.articleshome.css
@@ -4,19 +4,19 @@
}
#main {
- padding: 0px !important;
+ padding: 0 !important;
}
.main-page-left {
float: left;
width: 60%;
- padding: 10px 0px 0px 0px;
+ padding: 10px 0 0 0;
}
.main-page-right {
float: right;
width: 35%;
- padding: 10px 0px 0px 0px;
+ padding: 10px 0 0 0;
}
.main-page-sub-links a {
@@ -24,19 +24,19 @@
}
.side-articles {
- margin: 0px 0px 25px 0px;
+ margin: 0 0 25px 0;
}
.side-articles h2 {
font-size: 1.5em;
- padding: 0px 0px 5px 0px;
- margin: 0px 0px 10px 0px !important;
+ padding: 0 0 5px 0;
+ margin: 0 0 10px 0 !important;
border-bottom: 1px solid #dcdcdc !important;
}
.side-articles .listpageItem {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
+ padding: 0;
+ margin: 0;
font-size: 11px;
width: 350px;
}
@@ -47,23 +47,23 @@
/* Logged-In Articles */
.logged-in-articles {
- margin: 0px 0px 18px 0px;
+ margin: 0 0 18px 0;
}
.logged-in-articles h2 {
font-size: 1.5em;
- margin: 0px 0px 10px 0px;
- padding: 0px 0px 3px 0px;
+ margin: 0 0 10px 0;
+ padding: 0 0 3px 0;
border-bottom: 1px solid #dcdcdc;
}
.logged-in-articles p {
- margin: 10px 0px 10px 0px !important;
+ margin: 10px 0 10px 0 !important;
}
.logged-in-articles .listpageItem {
- padding: 0px 0px 10px 0px;
- margin: 0px 0px 10px 0px;
+ padding: 0 0 10px 0;
+ margin: 0 0 10px 0;
width: 600px;
}
@@ -71,12 +71,12 @@
color: #797979;
font-size: 10px;
vertical-align: middle;
- margin: -1px 0px 0px 5px;
+ margin: -1px 0 0 5px;
}
.rss-feed img {
vertical-align: middle;
- margin: 0px 3px 0px 0px;
+ margin: 0 3px 0 0;
}
.side-articles .listpages-item {
@@ -108,8 +108,8 @@
}
.listpages-link {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
.listpages-item {
@@ -118,7 +118,7 @@
.listpages-item a {
text-decoration: underline;
- font-weight: bold;
+ font-weight: 700;
}
.listpages-image {
@@ -127,16 +127,16 @@
}
.listpages-categories {
- color: #78BA5D;
+ color: #78ba5d;
font-size: 10px;
- font-weight: bold;
+ font-weight: 700;
}
.listpages-categories a {
- color: #78BA5D;
+ color: #78ba5d;
font-size: 10px;
text-decoration: none;
- border-bottom: 1px dotted #78BA5D;
+ border-bottom: 1px dotted #78ba5d;
}
.listpages-date {
@@ -146,55 +146,55 @@
.listpages-stats {
color: #666;
- font-weight: bold;
+ font-weight: 700;
font-size: 11px;
}
.listpages-stats img {
vertical-align: middle;
- margin: -2px 1px 0px 2px;
+ margin: -2px 1px 0 2px;
}
.listpages-votebox {
float: left;
- margin: 0px 10px 3px 0px;
+ margin: 0 10px 3px 0;
text-align: center;
width: 25px;
}
.rating-total {
color: #666;
- font-weight: bold;
+ font-weight: 700;
font-size: 11px;
}
.listpages-votebox-number {
- background-color: #89C46F;
- color: #FFFFFF;
- padding: 3px 0px 0px;
- margin: 0px 0px 2px 0px;
- font-weight: bold;
+ background-color: #89c46f;
+ color: #fff;
+ padding: 3px 0 0;
+ margin: 0 0 2px 0;
+ font-weight: 700;
height: 22px;
}
.listpages-votebox-text {
- margin: -1px 0px 0px 0px;
+ margin: -1px 0 0 0;
font-size: 9px;
color: #777;
line-height: 9px;
}
.listpages-commentbox-number {
- background-color: orange;
- color: #FFFFFF;
- font-weight: bold;
+ background-color: #ffa500;
+ color: #fff;
+ font-weight: 700;
height: 22px;
- margin: 0px 0px 2px;
- padding: 3px 0px 0px;
+ margin: 0 0 2px;
+ padding: 3px 0 0;
}
.listpages-blurb {
- margin: 0px 0px 2px 0px;
+ margin: 0 0 2px 0;
}
.listpages-blurb a {
@@ -203,7 +203,7 @@
}
.listpages-nav-buttons {
- margin: 10px 0px 0px 0px;
+ margin: 10px 0 0 0;
}
.listpages-blurb-size-small {
@@ -222,23 +222,23 @@
}
.listpage-button {
- background-color: #FAFAFA;
- border: 1px solid #DCDCDC;
- color: #376EA6;
+ background-color: #dcdcdc;
+ border: 1px solid #dcdcdc;
+ color: #376ea6;
font-size: 12px;
padding: 3px;
- margin: 0px 3px 0px 0px;
+ margin: 0 3px 0 0;
}
.listpage-button-off {
- background-color: #FAFAFA;
- border: 1px solid #DCDCDC;
+ background-color: #fafafa;
+ border: 1px solid #dcdcdc;
color: #797979;
font-size: 12px;
padding: 3px;
- margin: 0px 3px 0px 0px;
+ margin: 0 3px 0 0;
}
.listpages-nav-buttons a {
- margin: 0px 5px 0px 0px;
-}
\ No newline at end of file
+ margin: 0 5px 0 0;
+}
diff --git a/resources/css/BlogPage.css
b/resources/css/ext.blogpage.blogpage.css
similarity index 66%
rename from resources/css/BlogPage.css
rename to resources/css/ext.blogpage.blogpage.css
index 11f3aa8..a7819c9 100644
--- a/resources/css/BlogPage.css
+++ b/resources/css/ext.blogpage.blogpage.css
@@ -3,35 +3,35 @@
}
#main {
- padding: 0px 0px 0px 0px !important;
+ padding: 0 !important;
}
#main p {
font-size: 12px;
- font-weight: normal;
+ font-weight: 400;
line-height: 16px;
}
#blog-page-left {
position: absolute;
- right: 0px;
- top: 0px;
+ right: 0;
+ top: 0;
width: 20%;
}
#blog-page-middle {
- margin: 0px;
+ margin: 0;
width: 75%;
float: none;
overflow: visible;
- padding: 0px;
+ padding: 0;
}
#blog-page-right {
- float: right;/*left;*/
+ float: right; /*left;*/
width: 179px;
- padding: 8px 0px 0px 0px;
- background-color: #F2F4F7;
+ padding: 8px 0 0 0;
+ background-color: #f2f4f7;
border-left: 1px solid #dcdcdc;
border-bottom: 1px solid #dcdcdc;
padding: 10px;
@@ -39,28 +39,28 @@
}
#blog-page-middle h1.page-title {
- margin: 5px 0px 0px 0px !important;
+ margin: 5px 0 0 0 !important;
line-height: 22px;
}
#blog-page-middle #edit-menu {
- margin: 0px 0px 0px 7px !important;
+ margin: 0 0 0 7px !important;
}
.blog-left-units {
- background-color: #F2F4F7;
+ background-color: #f2f4f7;
padding: 10px 10px 5px 10px;
border-bottom: 1px solid #dcdcdc;
}
.blog-container {
- padding: 0px 0px 10px 0px;
- margin: 0px 0px 10px 0px;
+ padding: 0 0 10px 0;
+ margin: 0 0 10px 0;
border-bottom: 1px solid #dcdcdc;
}
.blog-container h2 {
- margin: 0px 0px 8px 0px !important;
+ margin: 0 0 8px 0 !important;
font-size: 16px;
letter-spacing: -1px;
color: #333;
@@ -69,83 +69,85 @@
.bottom-fix {
border-bottom: none !important;
padding-bottom: 5px !important;
- margin-bottom: 0px !important;
+ margin-bottom: 0 !important;
}
/* Author */
.author-container-fix {
- margin: 0px 0px 10px 0px;
+ margin: 0 0 10px 0;
}
.more-container {
- margin: 0px 0px 10px 0px;
- padding: 7px 0px 5px 0px;
+ margin: 0 0 10px 0;
+ padding: 7px 0 5px 0;
border-bottom: 1px solid #dcdcdc;
}
.more-container-fix {
- margin:0px !important;
- border:none !important;
+ margin: 0 !important;
+ border: 0 !important;
}
.blog-left-units h2 {
- letter-spacing: -1px;
- padding: 0px !important;
- margin: 0px !important;
color: #333;
+ letter-spacing: -1px;
+ padding: 0 !important;
+ margin: 0 !important;
+
}
.author-info {
font-size: 11px;
color: #333;
line-height: 14px;
- margin: 10px 0px 0px 0px;
+ margin: 10px;
}
.author-info img {
- float: left;
- border: 1px solid #dcdcdc;
- padding: 3px;
background-color: #fff;
- display: block;
+ border: 1px solid #dcdcdc;
text-align: justify;
- margin: 0px 10px 0px 0px;
+ padding: 3px;
+ margin: 0 10px 0 0;
+ display: block;
+ float: left;
}
.author-articles {
- margin: 4px 0px 0px 0px;
+ margin: 4px 0 0 0;
}
.more-container h3 {
- margin: 0px 0px 5px 0px !important;
+ color: #555;
font-size: 11px;
letter-spacing: -1px;
- color: #555;
+ margin: 0 0 5px 0 !important;
}
.author-title {
- margin: 0px 0px 6px 0px;
+ margin: 0 0 6px 0;
}
.author-title a {
- text-decoration: none;
font-size: 14px;
- font-weight: bold;
+ font-weight: 700;
+ text-decoration: none;
}
.author-article-item {
line-height: 12px;
- margin: 0px 0px 4px 0px;
+ margin: 0 0 4px 0;
}
.author-article-item a {
- text-decoration: none;
font-size: 11px;
+ text-decoration: none;
+
}
.author-item-small {
- font-size: 10px;
color: #888;
+ font-size: 10px;
}
.author-archive-link {
@@ -155,15 +157,15 @@
/* Recent Container */
.recent-container {
- margin: 0px 0px 10px;
- padding: 0px 0px 10px;
+ margin: 0 0 10px;
+ padding: 0 0 10px;
font-size: 11px;
border-bottom: 1px solid #dcdcdc;
}
.recent-container div {
font-size: 10px;
- margin: 0px 0px 5px 0px;
+ margin: 0 0 5px 0;
line-height: 11px;
color: #888;
}
@@ -171,27 +173,27 @@
.recent-container h2 {
letter-spacing: -1px;
font-size: 14px;
- margin: 0px 0px 1px 0px !important;
+ margin: 0 0 1px 0 !important;
color: #333;
}
.recent-item {
- margin: 0px 0px 0px 0px;
+ margin: 0;
}
.recent-title {
color: #444;
font-size: 12px;
line-height: 13px;
- font-weight: bold;
- margin: 0px 0px 10px 0px;
+ font-weight: 700;
+ margin: 0 0 10px 0;
}
.recent-container img {
padding: 2px;
- border: 1px solid #dcdcdc;
background-color: #fff;
- margin:2 px 2px 0px 0px
+ border: 1px solid #dcdcdc;
+ margin: 2px 2px 0 0;
}
.recent-container a {
@@ -200,21 +202,17 @@
/* Comment of the Day */
.cod-score {
- font-weight: bold;
+ font-weight: 700;
color: #fff;
- background-color: orange;
- padding: 0px 3px;
- margin: 0px 4px 0px 0px;
+ background-color: #ffa500;
+ padding: 0 3px;
+ margin: 0 4px 0 0;
}
-.cod-poster a {
- font-size: 12px;
- text-decoration: none;
-}
-
+.cod-poster a,
.cod-comment a {
- text-decoration: none;
font-size: 12px;
+ text-decoration: none;
}
.cod-comment {
@@ -222,7 +220,7 @@
}
.cod-item {
- margin: 0px 0px 5px 0px;
+ margin: 0 0 5px 0;
overflow: hidden;
}
@@ -235,112 +233,114 @@
/* Ad Unit */
.article-ad {
- margin: 10px 0px 0px 0px;
+ margin: 10px;
text-align: center;
}
.article-ad a {
- text-align: center;
+ text-align: inherit;
}
/* Casual Game */
.game-unit-container {
- padding: 0px 0px 10px 0px;
- margin: 0px 0px 10px 0px;
+ padding: 0 0 10px 0;
+ margin: 0 0 10px 0;
border-bottom: 1px solid #dcdcdc;
overflow: hidden;
}
.game-unit-container h2 {
- margin: 0px 0px 8px 0px !important;
+ color: #333;
font-size: 16px;
letter-spacing: -1px;
- color: #333;
+ margin: 0 0 8px 0 !important;
}
.poll-unit-title {
- font-size: 12px;
- line-height: 13px;
- font-weight: bold;
color: #777;
- margin: 0px 0px 8px 0px;
+ font-size: 12px;
+ font-weight: 700;
+ line-height: 13px;
+ margin: 0 0 8px 0;
}
.poll-unit-choices a {
+ font-size: inherit;
+ font-weight: inherit;
text-decoration: none;
- font-weight: bold;
- font-size: 12px;
display: block;
}
.poll-unit-image {
- margin: 0px 0px 8px 0px;
+ margin: 0 0 8px 0;
}
.poll-unit-image img {
- padding: 3px;
background-color: #fff;
border: 1px solid #dcdcdc;
+ padding: 3px;
}
.poll-unit-choices input {
- margin: 0px 5px 0px 0px;
+ margin: 0 5px 0 0;
}
.quiz-unit-image {
- margin: 8px 0px 0px 0px;
+ margin: 8px 0 0 0;
}
.quiz-unit-image img {
- padding: 3px;
background-color: #fff;
border: 1px solid #dcdcdc;
+ padding: 3px;
}
.quiz-unit-title a {
font-size: 13px;
text-decoration: none;
- font-weight: bold;
+ font-weight: 700;
}
.pg-unit-title {
- font-size: 12px;
- line-height: 13px;
- font-weight: bold;
color: #777;
- margin: 0px 0px 8px 0px;
+ font-size: 12px;
+ font-weight: 700;
+ line-height: 13px;
+ margin: 0 0 8px 0;
}
.pg-unit-pictures img {
- float: left;
background-color: #fff;
border: 1px solid #dcdcdc;
padding: 3px;
- margin: 0px 3px 0px 0px;
+ margin: 0 3px 0 0;
+ float: left;
}
.pickem-unit-game {
/*border-bottom: 1px solid #dcdcdc;*/
- padding: 8px 0px;
+ padding: 8px 0;
}
.pickem-unit-date {
- font-weight: bold;
+ font-weight: 700;
}
-.pickem-unit-visitor, .pickem-unit-home {
- margin: 5px 0px 0px 0px;
+.pickem-unit-visitor,
+.pickem-unit-home {
+ margin: 5px 0 0 0;
cursor: pointer;
}
-.pickem-unit-visitor img, .pickem-unit-home img{
+.pickem-unit-visitor img,
+.pickem-unit-home img {
vertical-align: middle;
border: 1px solid #dcdcdc;
- margin: 0px 5px 0px 0px;
+ margin: 0 5px 0 0;
}
.pickem-unit-nogame {
- font-weight: bold;
+ font-weight: 700;
color: #FF0000;
}
@@ -351,18 +351,18 @@
#blog-page-right .listpages-item a {
font-size: 12px !important;
- font-weight: normal !important;
+ font-weight: 400 !important;
text-decoration: none !important;
}
#blog-page-right .listpages-item {
- margin: 0px 0px 6px 0px !important;
+ margin: 0 0 6px 0 !important;
}
/* By Line */
.blog-byline {
- font-weight: bold;
- margin: 8px 0px 0px 0px;
+ font-weight: 700;
+ margin: 8px 0 0 0;
color: #555;
font-size: 13px;
}
@@ -370,10 +370,10 @@
.blog-byline-last-edited {
font-size: 11px;
color: #888;
- margin: 0px 0px 15px 0px;
+ margin: 0 0 15px 0;
}
/* Categories */
#categories {
- padding: 10px 0px;
-}
\ No newline at end of file
+ padding: 10px 0;
+}
diff --git a/resources/css/CreateBlogPost.css
b/resources/css/ext.blogpage.createblogpost.css
similarity index 79%
rename from resources/css/CreateBlogPost.css
rename to resources/css/ext.blogpage.createblogpost.css
index 8bd6bb0..492e9ea 100644
--- a/resources/css/CreateBlogPost.css
+++ b/resources/css/ext.blogpage.createblogpost.css
@@ -1,9 +1,9 @@
/* CSS for Special:CreateBlogPost */
.create-title {
- margin: 0px 0px 5px;
- color: rgb(51, 51, 51);
+ color: #333;
font-size: 14px;
- font-weight: bold;
+ font-weight: 700;
+ margin: 0 0 5px;
}
.categorytext {
@@ -13,26 +13,26 @@
/* Copyright stuff below the form, right above the submit button */
.copyright-warning {
- margin: 0px 0px 10px;
- width: 700px;
- color: rgb(51, 51, 51);
+ color: #333;
font-size: 11px;
+ margin: 0 0 10px;
+ width: 700px;
max-width: 100%;
}
#editform .title {
- margin: 0px 0px 5px;
- color: rgb(120, 186, 93);
+ color: #78ba5d;
font-size: 1.1em;
- font-weight: bold;
+ font-weight: 700;
+ margin: 0 0 5px;
}
/* Category tag cloud */
#create-tagcloud {
line-height: 25pt;
padding-bottom: 15px;
- max-width: 100%;
width: 600px;
+ max-width: 100%;
}
a.tag-cloud-entry {
@@ -50,4 +50,4 @@
/* Prevent the title input from overflowing */
max-width: 100%;
}
-}
\ No newline at end of file
+}
diff --git a/resources/js/CreateBlogPost.js
b/resources/js/ext.blogpage.createblogpost.js
similarity index 100%
rename from resources/js/CreateBlogPost.js
rename to resources/js/ext.blogpage.createblogpost.js
--
To view, visit https://gerrit.wikimedia.org/r/332083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e70459aee1614a8e04a908aa28c759568975d0b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Lewis Cawte <le...@lewiscawte.me>
Gerrit-Reviewer: UltrasonicNXT <adamr_car...@btinternet.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
