jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340251 )
Change subject: Separate preferences CSS into it's own module and file ...................................................................... Separate preferences CSS into it's own module and file Change-Id: I7e5ecaf8cc48a4cac08c23da5acfb506fc40d2e9 --- A resources/special.preferences.css M resources/style.css M skin.json 3 files changed, 95 insertions(+), 90 deletions(-) Approvals: SamanthaNguyen: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/special.preferences.css b/resources/special.preferences.css new file mode 100644 index 0000000..7882fc1 --- /dev/null +++ b/resources/special.preferences.css @@ -0,0 +1,87 @@ +/** Delicious copypasta from Monobook's main.css */ +/* js pref toc */ +#preftoc { + margin: 0; + padding: 0; + width: 100%; + clear: both; +} +#preftoc li { + background-color: #f0f0f0; + color: #000; +} +#preftoc li { + margin: 1px -2px 1px 2px; + float: left; + padding: 2px 0 3px 0; + border: 1px solid #fff; + border-right-color: #716f64; + border-bottom: 0; + position: relative; + white-space: nowrap; + list-style-type: none; + list-style-image: none; + z-index: 3; +} +#preftoc li.selected { + font-weight: bold; + background-color: #f9f9f9; + border: 1px solid #aaa; + border-bottom: none; + cursor: default; + top: 1px; + padding-top: 2px; + margin-right: -3px; +} +#preftoc > li.selected { + top: 2px; +} +#preftoc a, +#preftoc a:active { + display: block; + color: #000; + padding: 0 .7em; + position: relative; + text-decoration: none; +} +#preftoc li.selected a { + cursor: default; + text-decoration: none; +} +#preferences { + margin: 0; + border: 1px solid #aaa; + clear: both; + padding: 1.5em; + background-color: #F9F9F9; +} +.prefsection { + border: none; + padding: 0; + margin: 0; +} + +.prefsection legend { + font-weight: bold; +} +.prefsection table, .prefsection legend { + background-color: #F9F9F9; +} +.mainLegend { + display: none; +} +td.htmlform-tip { + font-size: x-small; + padding: .2em 2em; + color: #666; +} + +.preferences-login { + clear: both; + margin-bottom: 1.5em; +} + +.prefcache { + font-size: 90%; + margin-top: 2em; +} diff --git a/resources/style.css b/resources/style.css index 5954034..273c6c8 100644 --- a/resources/style.css +++ b/resources/style.css @@ -684,94 +684,6 @@ background: url(images/widget_heading.png) no-repeat right 6px; } -/** Delicious copypasta from Monobook's main.css */ -/* js pref toc */ -#preftoc { - margin: 0; - padding: 0; - width: 100%; - clear: both; -} -#preftoc li { - background-color: #f0f0f0; - color: #000; -} -#preftoc li { - margin: 1px -2px 1px 2px; - float: left; - padding: 2px 0 3px 0; - border: 1px solid #fff; - border-right-color: #716f64; - border-bottom: 0; - position: relative; - white-space: nowrap; - list-style-type: none; - list-style-image: none; - z-index: 3; -} -#preftoc li.selected { - font-weight: bold; - background-color: #f9f9f9; - border: 1px solid #aaa; - border-bottom: none; - cursor: default; - top: 1px; - padding-top: 2px; - margin-right: -3px; -} -#preftoc > li.selected { - top: 2px; -} -#preftoc a, -#preftoc a:active { - display: block; - color: #000; - padding: 0 .7em; - position: relative; - text-decoration: none; -} -#preftoc li.selected a { - cursor: default; - text-decoration: none; -} -#preferences { - margin: 0; - border: 1px solid #aaa; - clear: both; - padding: 1.5em; - background-color: #F9F9F9; -} -.prefsection { - border: none; - padding: 0; - margin: 0; -} - -.prefsection legend { - font-weight: bold; -} -.prefsection table, .prefsection legend { - background-color: #F9F9F9; -} -.mainLegend { - display: none; -} -td.htmlform-tip { - font-size: x-small; - padding: .2em 2em; - color: #666; -} - -.preferences-login { - clear: both; - margin-bottom: 1.5em; -} - -.prefcache { - font-size: 90%; - margin-top: 2em; -} - /* noarticletext */ div.noarticletext { border: 1px solid #ccc; diff --git a/skin.json b/skin.json index 1b24f72..15c06a1 100644 --- a/skin.json +++ b/skin.json @@ -1,9 +1,10 @@ { "name": "Dusk To Dawn", - "version": "1.3.3", + "version": "1.3.4", "author": [ "[http://automattic.com/ Automattic]", - "Jack Phoenix" + "Jack Phoenix", + "Samantha Nguyen" ], "url": "https://www.mediawiki.org/wiki/Skin:DuskToDawn", "descriptionmsg": "dusktodawn-desc", @@ -41,5 +42,10 @@ "position": "top" } }, + "ResourceModuleSkinStyles": { + "dusktodawn": { + "+mediawiki.special.preferences": "resources/special.preferences.css" + } + }, "manifest_version": 1 } -- To view, visit https://gerrit.wikimedia.org/r/340251 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e5ecaf8cc48a4cac08c23da5acfb506fc40d2e9 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/skins/DuskToDawn Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com> Gerrit-Reviewer: SamanthaNguyen <samanthanguyen1...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits