SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/329383 )
Change subject: Organize CSS, deleting stylesheets, remove old IE support ...................................................................... Organize CSS, deleting stylesheets, remove old IE support - Removed "editor-style.css" and "ie.css", since they weren't being loaded anyways. - Removed some specific lines that were for supporting ancient versions of IE(6!), and organized stylesheets by moving resets and wordpress-rules into their own stylehseets. - Bumped up version number (major change) Bug: T154200 Change-Id: I2092fe681ef3b68ffe80b63b64fb0674c5c4e75c --- D css/editor-style.css D css/ie.css A css/reset.css M css/style.css A css/wordpress-rules.css M skin.json 6 files changed, 78 insertions(+), 401 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored refs/changes/83/329383/1 diff --git a/css/editor-style.css b/css/editor-style.css deleted file mode 100644 index 01a45f8..0000000 --- a/css/editor-style.css +++ /dev/null @@ -1,301 +0,0 @@ -/* -Editor-Style CSS for ... - Theme Name: Desk Mess Mirrored - Theme URI: http://buynowshop.com/themes/desk-mess-mirrored/ - Version: 2.0 - Author: Edward Caissie - Author URI: http://edwardcaissie.com/ - License: GNU General Public License v2 - License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -*/ - -/** - * Copyright 2009-2012 Edward Caissie (email : edward.cais...@gmail.com) - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License version 2, as published by the - * Free Software Foundation. - * - * You may NOT assume that you can use any other version of the GPL. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to: - * - * Free Software Foundation, Inc. - * 51 Franklin St, Fifth Floor - * Boston, MA 02110-1301 USA - * - * The license for this software can also likely be found here: - * http://www.gnu.org/licenses/gpl-2.0.html - */ - -/** - * See index.php for additional program documentation and license information - * references. - */ - -/*-- YUI Reset: Start --*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin: 0; padding: 0; } -table { border-collapse: collapse; border-spacing: 0; } -fieldset,img { border: 0; } -address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; font-weight: normal; } -ol,ul { list-style: none; } -caption,th { text-align: left; } -h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; } -q:before,q:after { content: ''; } -abbr,acronym { border:0; } -/*-- YUI Reset: End --*/ - -/*-- WordPress Rules --*/ -div.aligncenter, .aligncenter, .center { margin: 0 auto; } -.alignleft, .left { float: left; text-align: left; } -.alignright, .right { float: right; text-align: right; } -img.aligncenter, img.center { display: block; } -img.alignleft, img.left { display: inline; margin: 0 8px 8px 0; } -img.alignright, img.right { display: inline; margin: 0 0 8px 8px; } -.wp-caption { border: 1px solid #ddd; text-align: center; background-color: #f3f3f3; padding-top: 4px; margin: 10px; -/* optional rounded corners for browsers that support it */ - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - -border-radius: 3px; -} -.wp-caption img { margin: 0; padding: 0; border: 0 none; } -.wp-caption p.wp-caption-text { font-size: 11px; line-height: 17px; padding: 0 4px 5px; margin: 0; } -/*-- End WordPress Rules --*/ - -/*-- Begin TinyMCE --*/ -html .mceContentBody { - max-width: 580px; - margin: 0; - padding: 0; - font-family: "Lucida Grande", "Lucida Sans Unicode", sans-serif; - font-size: 14px; - line-height: 21px; -} - -a:link, a:visited { color: #d21600; text-decoration: none; } -a:hover { text-decoration: underline; } -a:focus, a:active { color: #d21600; text-decoration: none; } - -a img { border: none; } - -em { font-style: italic; } - -h1, h2, h3, h4, h5, h6 { - font-family: Georgia, "Times New Roman", Times, serif; - font-weight: normal; - line-height: normal; -} - -h1 { - font-size: 25px; - padding-bottom: 2px; -} -h2 { - font-size: 20px; - padding-bottom: 11px; - padding-top: 15px; -} -h3 { - font-size: 17px; - padding-bottom: 10px; - padding-top: 14px; -} -h4 { - font-size: 15px; - padding-bottom: 10px; - padding-top: 12px; -} -h5 { - font-size: 13px; - padding-bottom: 10px; - padding-top: 11px; -} -h6 { - font-size: 11px; - padding-bottom: 10px; - padding-top: 10px; -} - -.hr, .desk-mess-mirrored { - border: none; - background: url(images/hr-img.png); - height: 40px; - width: 560px; - margin: 0 auto; -} - -ol li { list-style: decimal; } -ol li li { list-style: lower-roman; } -ol li li li { list-style: lower-alpha; } - -strong { font-weight: bold; } - -sub, sup { font-size: 75%; } - -table { margin: 0 auto; width: 90%; } -table caption { text-align: center; } -tr.even { - border: none; - border-bottom: 1px solid #b2b0a4; - border-top: 1px solid #b2b0a4; -} -th { font-weight: bold; } -td { padding-left: 5px; } - -h1 a, -h1 a:visited, -h1 a:active{ - color: #4a4131; - text-decoration: none; - border-bottom: 1px solid #b2b0a4; -} -h1 a:hover{ - color: #d21600; - text-decoration: none; - border-bottom: 1px solid #d21600; -} - -p { - margin: 0; - padding: 0 0 10px; -} - -ul li { - list-style: disc inside none; - padding-left: 10px; -} - -ol { - list-style: inside none; - padding-left: 10px; -} - -ul { - list-style: inside none; - padding-left: 10px; -} - -li { padding-left: 10px; } - - -ol, ul { - margin-left: 35px; - margin-bottom: 15px; -} - -dl { - margin-left: 5px; - margin-bottom: 10px; - border-right: 1px inset; - border-bottom: 1px inset; -} -dl dt { font-weight: bold; } -dl dd { margin-left:10px; } - -.sticky { - border: medium double Black; - font-family: "Trebuchet MS", Helvetica, Jamrul, sans-serif; - font-size: 14px; - padding: 5px; -} - -blockquote { - clear: both; - margin: 10px 35px 0 5px; - padding: 10px 0 0 40px; - background: url(images/quotes.png) no-repeat left 2px; - font-family: "Times New Roman", Times, serif; - font-style: italic; - font-size: 14px; - color: #606060; -} - -blockquote cite { - padding-left: 10px; - font-weight: bold; -} - -pre { /* Use for "Code" text styling */ - margin: 0; - padding: 5px; - background-image: url(images/pre-bg.png); - border: 1px inset; - font-style: italic; - font-size: 14px; - text-align: left; - overflow: auto; - - overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */ - white-space: pre-wrap; /* css-3 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} - -p img { - height: auto; - padding: 0; - max-width: 100%; -} - -p a img { border: none; } - -.alignleft, .left { float: left; } -.alignright, .right { float: right; } - -.wp-caption { - border: 1px solid #59350b; - text-align: center; - background-color: #f3f3f3; - padding-top: 4px; - margin: 10px; - /* optional rounded corners for browsers that support it */ - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - -border-radius: 3px; -} - -.wp-caption.aligncenter { margin: 10px auto; } - -.wp-caption img { - margin: 0; - padding: 0; - border: 0 none; -} - -.wp-caption p.wp-caption-text { - font-size: 11px; - line-height: 17px; - padding: 0 4px 5px; - margin: 0; -} - -.odd { - margin-top: 1px; - background: #f2f2f2; - border: 1px solid #b2b0a4; -} - -.even { - margin-top: 1px; - background: #ffffff; - border: 1px solid #b2b0a4; -} - -code { - margin: 0; - background-color: Silver; - font-style: italic; - font-size: 14px; - text-align: left; - overflow: auto; - - overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */ - white-space: pre-wrap; /* css-3 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} \ No newline at end of file diff --git a/css/ie.css b/css/ie.css deleted file mode 100644 index 3973418..0000000 --- a/css/ie.css +++ /dev/null @@ -1,6 +0,0 @@ -/* Fix search suggestions 'cause jQuery blows, apparently, as these values are all zeroed on my IE11... */ -html > body div.suggestions { - left: 865px; - top: 750px; - width: 200px; -} \ No newline at end of file diff --git a/css/reset.css b/css/reset.css new file mode 100644 index 0000000..54b3669 --- /dev/null +++ b/css/reset.css @@ -0,0 +1,9 @@ +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin: 0; padding: 0; } +table { border-collapse: collapse; border-spacing: 0; } +fieldset,img { border: 0; } +address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; font-weight: normal; } +ol,ul { list-style: none; } +caption,th { text-align: left; } +h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; } +q:before,q:after { content: ''; } +abbr,acronym { border:0; } diff --git a/css/style.css b/css/style.css index 2760614..1ffcbc9 100644 --- a/css/style.css +++ b/css/style.css @@ -36,76 +36,6 @@ * http://www.gnu.org/licenses/gpl-2.0.html */ -/** - * See index.php for additional program documentation and license information - * references. - */ - -/** ------------------------------------------------------------------------- */ -/** Order of Contents -- editing tip: highlight section title then use find to locate in stylesheet */ - -/*-- YUI Reset --*/ -/*-- WordPress Rules --*/ -/*-- GLOBAL --*/ -/* === HEADER === */ -/* === MENU === */ - -/* === MAIN AREA === */ -/* === MAIN BLOG === */ -/*-- Post Formats --*/ -/*-- Images --*/ -/*-- Gallery --*/ - -/* === COMMENTS === */ -/*- Author Classes -*/ -/* === Forms === */ - -/* === SIDEBAR === */ -/*-- Calendar --*/ -/*-- Search --*/ - -/* === FOOTER === */ - -/* === Miscellaneous Plugin Styles === */ -/** ------------------------------------------------------------------------- */ - -/*-- YUI Reset --*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin: 0; padding: 0; } -table { border-collapse: collapse; border-spacing: 0; } -fieldset,img { border: 0; } -address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; font-weight: normal; } -ol,ul { list-style: none; } -caption,th { text-align: left; } -h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; } -q:before,q:after { content: ''; } -abbr,acronym { border: 0; } -/*-- YUI Reset: End --*/ - -/*-- WordPress Rules --*/ -div.aligncenter, .aligncenter, .center { margin: 0 auto; } -.alignleft, .left { float: left; text-align: left; } -.alignright, .right { float: right; text-align: right; } -img.aligncenter, img.center { clear: both; display: block; } -img.alignleft, img.left { display: inline; margin: 0 8px 8px 0; } -img.alignright, img.right { display: inline; margin: 0 0 8px 8px; } -.wp-caption { - border: 1px solid #ddd; - text-align: center; - background-color: #f3f3f3; - padding-top: 4px; - /* margin: 10px; */ - /* optional rounded corners for browsers that support it */ - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - -border-radius: 3px; -} -.wp-caption img { margin: 0; padding: 0; border: 0 none; } -.wp-caption p.wp-caption-text { font-size: 11px; line-height: 17px; padding: 0 4px 5px; margin: 0; } -/*-- End WordPress Rules --*/ - -/** === Default Widgets === ------------------------------------------------- */ /** Calendar */ table#wp-calendar { margin: 0 auto; @@ -115,9 +45,11 @@ table#wp-calendar tbody tr td#today { outline: 1px solid; } table#wp-calendar tbody tr td a { font-weight: bold; } table#wp-calendar tfoot tr td#next { text-align: right; } + /** RSS */ li.widget_rss ul li cite { font-style: italic; } li.widget_rss ul li cite:before { content: '~ '; } + /** Text Widgets */ li.widget_text { margin: 10px 0 20px 4px; @@ -136,9 +68,8 @@ } /** Tag Cloud */ div.tagcloud { text-align: center; } -/** End: Default Widgets ---------------------------------------------------- */ -/*-- GLOBAL --*/ +/* GLOBAL */ * { margin: 0; padding: 0; } *:focus { outline: none; } @@ -216,7 +147,6 @@ overflow: auto; text-align: left; white-space: pre-wrap; /* css-3 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ } dl { @@ -562,7 +492,6 @@ #content { clear: both; - width: 940px; /* reduced from 950px - corrects IE6 horizontal scroll */ /* margin: 0 0 0 45px; */ margin: 0 0 0 35px; } @@ -818,13 +747,8 @@ background-color: #f3f3f3; border: 1px solid #59350b; padding-top: 4px; - /* margin: 10px; */ max-width: 578px; text-align: center; - /* optional rounded corners for browsers that support it */ - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; border-radius: 3px; } @@ -952,10 +876,6 @@ padding: 5px; overflow-x: hidden; overflow-y: auto; - /* optional rounded corners for browsers that support it */ - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; border-radius: 5px; } #commentform #submit { @@ -1124,10 +1044,6 @@ input, textarea { border: 1px solid #b2b0a4; padding: 0 4px 0 3px; - /* optional rounded corners for browsers that support it */ - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; border-radius: 5px; } @@ -1281,10 +1197,6 @@ li.widget input#search-submit, input.search-submit { - /* optional rounded corners for browsers that support it */ - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; border-radius: 5px; } @@ -1466,4 +1378,4 @@ } div#p-cactions li a { padding: 5px; -} \ No newline at end of file +} diff --git a/css/wordpress-rules.css b/css/wordpress-rules.css new file mode 100644 index 0000000..b3d5aaf --- /dev/null +++ b/css/wordpress-rules.css @@ -0,0 +1,56 @@ +div.aligncenter, +.aligncenter, +.center { + margin: 0 auto; +} + +.alignleft, +.left { + float: left; + text-align: left; +} + +.alignright, +.right { + float: right; + text-align: right; +} + +img.aligncenter, +img.center { + clear: both; + display: block; +} + +img.alignleft, +img.left { + display: inline; + margin: 0 8px 8px 0; +} + +img.alignright, +img.right { + display: inline; + margin: 0 0 8px 8px; +} + +.wp-caption { + border: 1px solid #ddd; + text-align: center; + background-color: #f3f3f3; + padding-top: 4px; + border-radius: 3px; +} + +.wp-caption img { + margin: 0; + padding: 0; + border: 0 none; +} + +.wp-caption p.wp-caption-text { + font-size: 11px; + line-height: 17px; + padding: 0 4px 5px; + margin: 0; +} diff --git a/skin.json b/skin.json index 985d6e1..e86f4c4 100644 --- a/skin.json +++ b/skin.json @@ -1,9 +1,10 @@ { "name": "Desk Mess Mirrored", - "version": "2.2.5", + "version": "3.2.5", "author": [ "[http://edwardcaissie.com/ Edward Caissie]", - "Jack Phoenix" + "Jack Phoenix", + "Samantha Nguyen" ], "url": "https://www.mediawiki.org/wiki/Skin:DeskMessMirrored";, "descriptionmsg": "deskmessmirrored-skin-desc", @@ -31,6 +32,12 @@ "styles": { "css/style.css": { "media": "screen" + }, + "css/wordpress-rules.css": { + "media": "screen" + }, + "css/reset.css": { + "media": "screen" } }, "position": "top" -- To view, visit https://gerrit.wikimedia.org/r/329383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2092fe681ef3b68ffe80b63b64fb0674c5c4e75c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DeskMessMirrored 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
