jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358310 )
Change subject: Clean up CSS per MediaWiki coding conventions, removed BOMs ...................................................................... Clean up CSS per MediaWiki coding conventions, removed BOMs Change-Id: I843161da9a51dfffe4471ae437fc1c767e74e5b5 --- M deepsea/big.css M deepsea/interactive.css M deepsea/screen.css M deepsea/small.css M deepsea/special.preferences.styles.css M skin.json 6 files changed, 739 insertions(+), 586 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/deepsea/big.css b/deepsea/big.css index 9694bec..7b8b16f 100644 --- a/deepsea/big.css +++ b/deepsea/big.css @@ -1 +1,49 @@ -div#mw-panel { left: 0px; top: 170px !important; } div#content { margin-left: 15%; margin-right: 1em; } /* Navigation Containers */ #left-navigation { left: 15%; top: 3.5em; } #right-navigation { margin-top: 3.5em; margin-right: 1em; } #p-logo { position: absolute; top: -9em; left: 0; width: 100%; height: 6em; } .mobile { display:none !important; } #p-search { border-top-right-radius: 1em; } #p-ad-container { margin-right: 1.25em; } #p-ad-ad { margin: auto; width: 120px; } #footer ins { display: block !important; } \ No newline at end of file +div#mw-panel { + left: 0; + top: 170px !important; +} + +div #content { + margin-left: 15%; + margin-right: 1em; +} + +/* Navigation Containers */ +#left-navigation { + left: 15%; + top: 3.5em; +} + +#right-navigation { + margin-top: 3.5em; + margin-right: 1em; +} + +#p-logo { + position: absolute; + top: -9em; + left: 0; + width: 100%; + height: 6em; +} + +.mobile { + display: none !important; +} + +#p-search { + border: 0 1em 0 0; +} + +#p-ad-container { + margin-right: 1.25em; +} + +#p-ad-ad { + margin: auto; + width: 120px; +} + +#footer ins { + display: block !important; +} diff --git a/deepsea/interactive.css b/deepsea/interactive.css index fcbecf9..3e4eaba 100644 --- a/deepsea/interactive.css +++ b/deepsea/interactive.css @@ -1,4 +1,3 @@ -/* INTERACTIVE.CSS */ .vectorTabs li, .vectorMenu li, .vectorMenu { diff --git a/deepsea/screen.css b/deepsea/screen.css index daa4ff5..c866278 100644 --- a/deepsea/screen.css +++ b/deepsea/screen.css @@ -23,404 +23,450 @@ font-family: sans-serif; font-size: 1em; } + /* Content */ div#content { - border-right: 0px; + border-right: 0; padding: 1em; direction: ltr; - background-color: white; + background-color: #fff; line-height: 1.5em; color: #252525; font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif; } + /* Head */ #mw-page-base { height: 6em; } + #mw-head-base { margin-top: -6em; margin-left: 15%; height: 6em; } + div#mw-head { position: absolute; top: 0; right: 0; width: 100%; } + div#mw-head h5 { margin: 0; padding: 0; } - /* Hide empty portlets */ - div.emptyPortlet { - display: none; - } - /* Personal */ - #p-personal { - position: absolute; - top: 0; - right: 0; - border-bottom-left-radius: 1em; - } - #p-personal h5 { - display: none; - } - #p-personal ul { - list-style: none; - margin: 0; - } - #p-personal li:first-child { - border-bottom-left-radius: 1em; - } - #p-personal li:last-child { - padding-right: 10px; - } - /* @noflip */ - div.top-nav li { - line-height: 1.125em; - float: left; - } - /* This flips! */ - div.top-nav li { - padding: 0.5em; - padding-right: 0.25em; - padding-left: 0.25em; - font-size: 0.75em; - white-space: nowrap; - } - div.top-nav li a { - padding: 0.5em; - } - div.top-nav li a:hover { - text-decoration: none; - } +/* Hide empty portlets */ +div.emptyPortlet { + display: none; +} - /* Navigation Containers */ - #left-navigation { - position: absolute; - } - #right-navigation { - float: right; - } - /* Navigation Labels */ - div.vectorTabs h5, - div.vectorMenu h5 span { - display: none; - } - /* Namespaces and Views */ - /* @noflip */ - div.vectorTabs { - float: left; - height: 2.5em; - } - /* @noflip */ - /*div.vectorTabs ul { - float: left; - }*/ - div.vectorTabs ul { - height: 65%; - list-style: none; - margin: 0; - padding: 0; - } - /* @noflip */ +/* Personal */ +#p-personal { + position: absolute; + top: 0; + right: 0; + border-radius: 0 0 0 1em; +} + +#p-personal h5 { + display: none; +} + +#p-personal ul { + list-style: none; + margin: 0; +} + +#p-personal li:first-child { + border-radius: 0 0 0 1em; +} + +#p-personal li:last-child { + padding-right: 10px; +} + +/* @noflip */ +div.top-nav li { + line-height: 1.125em; + float: left; +} + +/* This flips! */ +div.top-nav li { + padding: .5em .25em; + font-size: 0.75em; + white-space: nowrap; +} + +div.top-nav li a { + padding: 0.5em; +} + +div.top-nav li a:hover { + text-decoration: none; +} + +/* Navigation Containers */ +#left-navigation { + position: absolute; +} + +#right-navigation { + float: right; +} + +/* Navigation Labels */ +div.vectorTabs h5, +div.vectorMenu h5 span { + display: none; +} + +/* Namespaces and Views */ +/* @noflip */ +div.vectorTabs { + float: left; + height: 2.5em; +} +/* @noflip */ +/*div.vectorTabs ul { + float: left; +}*/ + +div.vectorTabs ul { + height: 65%; + list-style: none; + margin: 0; + padding: 0; +} + +/* @noflip */ div.vectorTabs li { - float: left; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - div.vectorTabs li { - line-height: 1.125em; - display: inline-block; - height: 100%; - margin: 0; - padding: 0; - white-space:nowrap; - } - /* IGNORED BY IE6 */ - /*div.vectorTabs li { - display: block; - }*/ + float: left; +} - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - div.vectorTabs li a { - display: inline-block; - height: 1em; - padding: 1em; - padding-bottom: 1.1em; - cursor: pointer; - font-size: 0.8em; - } - div.vectorTabs li a:hover { - text-decoration: none; - } +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +div.vectorTabs li { + line-height: 1.125em; + display: inline-block; + height: 100%; + margin: 0; + padding: 0; + white-space: nowrap; +} - /* IGNORED BY IE6 */ - div.vectorTabs li > a { - display: block; - } - div.vectorTabs li.icon a { - background-position: bottom right; - background-repeat: no-repeat; - } - #p-namespaces li:first-of-type, #p-views li:first-of-type { - border-top-left-radius: 1em; - } - #p-namespaces li:last-of-type { - border-top-right-radius: 1em; - } - #right-navigation div.emptyPortlet + div.emptyPortlet + div { - border-top-left-radius: 1em; - } +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +div.vectorTabs li a { + display: inline-block; + height: 1em; + padding: 1em; + padding-bottom: 1.1em; + cursor: pointer; + font-size: 0.8em; +} - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - div.vectorTabs a { - display: inline-block; - padding-top: 1em; - } +div.vectorTabs li a:hover { + text-decoration: none; +} - div.vectorTabs li.selected a, - div.vectorTabs li.selected a:visited{ - color: #333333; - text-decoration: none; - } - div.vectorTabs li.new a, - div.vectorTabs li.new a:visited { - color: #815252 !important; - } - /* Variants and Actions */ - /* @noflip */ - div.vectorMenu { - direction: ltr; - padding-right: 5px; - float: left; - /* @embed */ - background-image: url(images/arrow-down-icon.png); - background-position: 100% 60%; - background-repeat: no-repeat; - cursor: pointer; - } - div.vectorMenuFocus { - /* @embed */ - background-image: url(images/arrow-down-focus-icon.png); - background-position: 100% 60%; - } - /* @noflip */ - body.rtl div.vectorMenu { - direction: rtl; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - /* @noflip */ - div#mw-head div.vectorMenu h5 { - float: left; - } - /* This will be flipped - unlike the one above it */ - div#mw-head div.vectorMenu h5 { - background-position: bottom left; - margin-left: -1px; - } - /* IGNORED BY IE6 */ - div#mw-head div.vectorMenu > h5 { - background-image: none; - } - div#mw-head div.vectorMenu h4 { - display: inline-block; - float: left; - font-size: 0.8em; - padding-left: 0.5em; - padding-top: 1.375em; - font-weight: normal; - border: none; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - /* @noflip */ - div.vectorMenu h5 a { - display: inline-block; - width: 24px; - height: 2.3em; - text-decoration: none; - } +/* IGNORED BY IE6 */ +div.vectorTabs li > a { + display: block; +} - /* IGNORED BY IE6 */ - div.vectorMenu h5 > a { - display: block; - } - div.vectorMenu div.menu { - left: -26px; - position: relative; - display: none; - clear: both; - text-align: left; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - /* @noflip */ - body.rtl div.vectorMenu div.menu { - margin-left: 24px; - } - /* IGNORED BY IE6 */ - /* @noflip */ - body.rtl div.vectorMenu > div.menu { - margin-left: auto; - } - /* IGNORED BY IE6 */ - /* Also fixes old versions of FireFox */ - /* @noflip */ - body.rtl div.vectorMenu > div.menu, +div.vectorTabs li.icon a { + background-position: bottom right; + background-repeat: no-repeat; +} + +#p-namespaces li:first-of-type, #p-views li:first-of-type { + border-radius: 1em 0 0 0; +} + +#p-namespaces li:last-of-type { + border-radius: 0 1em 0 0; +} + +#right-navigation div.emptyPortlet + div.emptyPortlet + div { + border-radius: 1em 0 0 0; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +div.vectorTabs a { + display: inline-block; + padding-top: 1em; +} + +div.vectorTabs li.selected a, +div.vectorTabs li.selected a:visited { +color: #333; + text-decoration: none; +} + +div.vectorTabs li.new a, +div.vectorTabs li.new a:visited { + color: #815252 !important; +} + +/* Variants and Actions */ +/* @noflip */ + +div.vectorMenu { + direction: ltr; + padding-right: 5px; + float: left; + /* @embed */ + background-image: url(images/arrow-down-icon.png); + background-position: 100% 60%; + background-repeat: no-repeat; + cursor: pointer; +} + +div.vectorMenuFocus { + /* @embed */ + background-image: url(images/arrow-down-focus-icon.png); + background-position: 100% 60%; +} + +/* @noflip */ +body.rtl div.vectorMenu { + direction: rtl; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +/* @noflip */ +div#mw-head div.vectorMenu h5 { + float: left; +} + +/* This will be flipped - unlike the one above it */ +div#mw-head div.vectorMenu h5 { + background-position: bottom left; + margin-left: -1px; +} + +/* IGNORED BY IE6 */ +div#mw-head div.vectorMenu > h5 { + background-image: none; +} + +div#mw-head div.vectorMenu h4 { + display: inline-block; + float: left; + font-size: 0.8em; + padding-left: 0.5em; + padding-top: 1.375em; + font-weight: normal; + border: none; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +/* @noflip */ +div.vectorMenu h5 a { + display: inline-block; + width: 24px; + height: 2.3em; + text-decoration: none; +} + +/* IGNORED BY IE6 */ +div.vectorMenu h5 > a { + display: block; +} + +div.vectorMenu div.menu { + left: -26px; + position: relative; + display: none; + clear: both; + text-align: left; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +/* @noflip */ +body.rtl div.vectorMenu div.menu { + margin-left: 24px; +} + +/* IGNORED BY IE6 */ +/* @noflip */ +body.rtl div.vectorMenu > div.menu { + margin-left: auto; +} + +/* IGNORED BY IE6 */ +/* Also fixes old versions of FireFox */ +/* @noflip */ +body.rtl div.vectorMenu > div.menu, x:-moz-any-link { - margin-left: 23px; - } - /* Enable forcing showing of the menu for accessibility */ - div.vectorMenu:hover div.menu, - div.vectorMenu div.menuForceShow { - display: block; - } - div.vectorMenu ul { - position: absolute; - border-top-width: 0; - list-style: none; - list-style-image: none; - list-style-type: none; - padding: 0; - margin: 0; - margin-left: -1px; - text-align: left; - background-color: white; - } - /* Fixes old versions of FireFox */ - div.vectorMenu ul, - x:-moz-any-link { - min-width: 5em; - } - /* Returns things back to normal in modern versions of FireFox */ - div.vectorMenu ul, - x:-moz-any-link, - x:default { - min-width: 0; - } - div.vectorMenu li { - padding: 0; - margin: 0; - text-align: left; - line-height: 1em; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - div.vectorMenu li a { - display: inline-block; - padding: 0.5em; - white-space: nowrap; - cursor: pointer; - font-size: 0.8em; - } - /* IGNORED BY IE6 */ - div.vectorMenu li > a { - display: block; - } - div.vectorMenu li.selected a, - div.vectorMenu li.selected a:visited { - color: #333333; - text-decoration: none; - } - /* Search */ - #p-search h5 { - display: none; - } - /* @noflip */ - #p-search { - float: left; - } - #p-search { - height: 1.5em; - padding-left: 1em; - padding-top: 0.6em; - padding-bottom: 0.4em; - padding-right: 1em; - } - #p-search form, - #p-search input { - margin: 0; - } - #p-search input[type=search], #p-search input[name=search] { - width:8em; - } + margin-left: 23px; +} - div#simpleSearch { - display: block; - width: 14em; - height: 1.5em; - /*margin-top: 0.65em;*/ - position: relative; - min-height: 1px; /* Gotta trigger hasLayout for IE7 */ - border: solid 1px #AAAAAA; - color: black; - background-color: white; - } - div#simpleSearch label { - /* - * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent - * this from ever being shown anyways. - */ - font-size: 13px; - top: 0.25em; - direction: ltr; - } - div#simpleSearch input { - color: black; - direction: ltr; - } - div#simpleSearch input:focus { - outline: none; - } - div#simpleSearch input.placeholder { - color: #999999; - } - div#simpleSearch input::-webkit-input-placeholder { - color: #999999; - } - div#simpleSearch input#searchInput { - position: absolute; - top: 0; - left: 0; - width: 90%; - margin: 0; - padding: 0; - padding-left: 0.2em; - padding-top: 0.2em; - padding-bottom: 0.2em; - outline: none; - border: none; - /* - * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent - * this from ever being shown anyways. - */ - font-size: 13px; - background-color: transparent; - direction: ltr; - } - div#simpleSearch button#searchButton { - position: absolute; - right: 5%; - top: 0; - padding: 0; - padding-top: 0.3em; - padding-bottom: 0.2em; - margin: 0; - border: none; - cursor: pointer; - background-color: transparent; - background-image: none; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - div#simpleSearch button#searchButton img { - border: none; - margin: 0; - margin-top: -3px; - padding: 0; - } - /* IGNORED BY IE6 */ - div#simpleSearch button#searchButton > img { - margin: 0; - } +/* Enable forcing showing of the menu for accessibility */ +div.vectorMenu:hover div.menu, +div.vectorMenu div.menuForceShow { + display: block; +} + +div.vectorMenu ul { + position: absolute; + border-top-width: 0; + list-style: none; + padding: 0; + margin: 0; + margin-left: -1px; + text-align: left; + background-color: #fff; +} + +/* Fixes old versions of FireFox */ +div.vectorMenu ul, +x:-moz-any-link { + min-width: 5em; +} + +/* Returns things back to normal in modern versions of FireFox */ +div.vectorMenu ul, +x:-moz-any-link, +x:default { + min-width: 0; +} + +div.vectorMenu li { + padding: 0; + margin: 0; + text-align: left; + line-height: 1em; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +div.vectorMenu li a { + display: inline-block; + padding: 0.5em; + white-space: nowrap; + cursor: pointer; + font-size: 0.8em; +} + +/* IGNORED BY IE6 */ +div.vectorMenu li > a { + display: block; +} + +div.vectorMenu li.selected a, +div.vectorMenu li.selected a:visited { + color: #333; + text-decoration: none; +} + +/* Search */ +#p-search h5 { + display: none; +} + +/* @noflip */ +#p-search { + float: left; +} + +#p-search { + height: 1.5em; + padding: 0.6em 1em 0.4em 1em; +} + +#p-search form, +#p-search input { + margin: 0; +} + +#p-search input[type=search], +#p-search input[name=search] { + width:8em; +} + +div#simpleSearch { + display: block; + width: 14em; + height: 1.5em; + /*margin-top: 0.65em;*/ + position: relative; + min-height: 1px; /* Gotta trigger hasLayout for IE7 */ + border: solid 1px #aaa; + color: #000; + background-color: #fff; +} + +div#simpleSearch label { + /* + * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent + * this from ever being shown anyways. + */ + font-size: 13px; + top: 0.25em; + direction: ltr; +} + +div#simpleSearch input { + color: #000; + direction: ltr; +} + +div#simpleSearch input:focus { + outline: none; +} + +div#simpleSearch input.placeholder { + color: #999; +} + +div#simpleSearch input::-webkit-input-placeholder { + color: #999; +} + +div#simpleSearch input#searchInput { + position: absolute; + top: 0; + left: 0; + width: 90%; + margin: 0; + padding: .2em 0 .2em .2em; + outline: none; + border: none; + /* + * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent + * this from ever being shown anyways. + */ + font-size: 13px; + background-color: transparent; + direction: ltr; +} + +div#simpleSearch button#searchButton { + position: absolute; + right: 5%; + top: 0; + padding: .3em 0 .2em 0; + margin: 0; + border: none; + cursor: pointer; + background-color: transparent; + background-image: none; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +div#simpleSearch button#searchButton img { + border: none; + margin: 0; + margin-top: -3px; + padding: 0; +} + +/* IGNORED BY IE6 */ +div#simpleSearch button#searchButton > img { + margin: 0; +} /* Panel */ div#mw-panel { position: absolute; @@ -430,77 +476,85 @@ /* min-width: 160px;*/ /* left: 0px;*/ } - div#mw-panel div.portal { - margin-bottom: 1.5em; - direction: ltr; - } - div#mw-panel div.portal h5 { - font-weight: normal; - /* Nathan's rejected idea: - font-weight: bold; - text-transform: uppercase;*/ - color: #444444; - padding: 0.25em; - padding-left: 1.75em; - cursor: default; - border: none; - font-size: 0.75em; - margin-right: 1.25em; - margin-bottom: 0em; - background-color: white; - } - div#mw-panel div.portal div.body { - margin: 0; - } - div#mw-panel div.portal div.body ul { - list-style: none; - list-style-image: none; - list-style-type: none; - padding: 0; - margin: 0; - } - div#mw-panel div.portal div.body ul li { - line-height: 1.125em; - padding: 0; - /*padding-bottom: 0.25em; - padding-top: 0.25em;*/ - padding-left: 1.25em; - margin: 0; - overflow: hidden; - font-size: 0.75em; - margin-right: 1.25em; - } - div#mw-panel div.portal div.body ul li:first-child { - padding-top: 0.25em; - } - div#mw-panel div.portal div.body ul li:last-child { - border-bottom-right-radius: 1em; - } - div#mw-panel div.portal div.body ul li a { - display: block; - padding-top: 0.25em; - padding-bottom: 0.25em; - } - div#mw-panel div.portal div.body ul li a:visited { - color: #0b0080; - } - div#mw-panel div.portal div.body ul li a:hover { - text-decoration: none; - } - #expander { - z-index: 2; - display: none; - position: fixed; - top: 0; - left: 0; - /*opacity: 0.5;*/ - border-bottom-right-radius: 1em; - padding: 1px 3px 1px 3px; - } +div#mw-panel div.portal { + margin-bottom: 1.5em; + direction: ltr; +} + +div#mw-panel div.portal h5 { + font-weight: normal; + /* Nathan's rejected idea: + font-weight: bold; + text-transform: uppercase;*/ + color: #444; + padding: 0.25em; + padding-left: 1.75em; + cursor: default; + border: none; + font-size: 0.75em; + margin-right: 1.25em; + margin-bottom: 0em; + background-color: #fff; +} + +div#mw-panel div.portal div.body { + margin: 0; +} + +div#mw-panel div.portal div.body ul { + list-style: none; + padding: 0; + margin: 0; +} + +div#mw-panel div.portal div.body ul li { + line-height: 1.125em; + /*padding-bottom: 0.25em; + padding-top: 0.25em;*/ + padding: 0 0 0 1.25em; + margin: 0; + overflow: hidden; + font-size: 0.75em; + margin-right: 1.25em; +} + +div#mw-panel div.portal div.body ul li:first-child { + padding-top: 0.25em; +} + +div#mw-panel div.portal div.body ul li:last-child { + border-radius: 0 0 1em 0; +} + +div#mw-panel div.portal div.body ul li a { + display: block; + padding-top: 0.25em; + padding-bottom: 0.25em; + padding: .25em 0; +} + +div#mw-panel div.portal div.body ul li a:visited { + color: #0b0080; +} + +div#mw-panel div.portal div.body ul li a:hover { + text-decoration: none; +} + +#expander { + z-index: 2; + display: none; + position: fixed; + top: 0; + left: 0; + /*opacity: 0.5;*/ + border-radius: 0 0 1em 0; + padding: 1px 3px; +} .ad { - background-color: #CCCCCC; + background-color: #ccc; } .ad.left { @@ -522,48 +576,50 @@ padding: 0.75em; direction: ltr; } + div#footer ul { list-style: none; - list-style-image: none; - list-style-type: none; margin: 0; padding: 0; } + div#footer ul li { margin: 0; - padding: 0; - padding-top: 0.5em; - padding-bottom: 0.5em; - color: #333333; + padding: .5em 0; + color: #333; font-size: 0.7em; } + div#footer #footer-icons { /*float: right;*/ } + /* @noflip */ body.ltr div#footer #footer-places { float: left; } + div#footer #footer-info li { line-height: 1.4em; display: inline; white-space: nowrap; margin-right: 2em; } + div#footer #footer-icons li { float: left; margin-left: 0.5em; line-height: 2em; text-align: right; } + div#footer #footer-places li { float: left; margin-right: 1em; line-height: 2em; } + /* Logo */ -#p-logo { -} #p-logo a { display: block; width: 100%; @@ -600,15 +656,17 @@ #siteNotice { font-size: 0.8em; } + #firstHeading { padding-top: 0; margin-top: 0; - padding-top: 0; font-size: 1.6em; } + div#content .printfooter { display: none; } + /* Icon for Usernames */ #pt-userpage, #pt-anonuserpage, @@ -651,35 +709,42 @@ /* @embed */ background-image: url(images/watch-icons.png); } + #ca-unwatch.icon a { background-position: -43px 60%; } + #ca-watch.icon a { background-position: 5px 60%; } + #ca-unwatch.icon a:hover, #ca-unwatch.icon a:focus { background-position: -67px 60%; } + #ca-watch.icon a:hover, #ca-watch.icon a:focus { background-position: -19px 60%; } + #ca-unwatch.icon a.loading, #ca-watch.icon a.loading { /* @embed */ background-image: url(images/watch-icon-loading.gif); background-position: 5px 60%; } + #ca-unwatch.icon a span, #ca-watch.icon a span { display: none; } + div.vectorTabs ul { /* @embed */ - background-image:url(images/tab-break.png); - background-position:right bottom; - background-repeat:no-repeat; + background-image: url(images/tab-break.png); + background-position: right bottom; + background-repeat: no-repeat; } /* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */ @@ -689,15 +754,22 @@ /* Typography refresh */ -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { font-family: "Lato", "Helvetica", "Arial", sans-serif; line-height: 1.3; } -h1, h2 { +h1, +h2 { border-color: #ddd; } -h2, h3 { +h2, +h3 { font-weight: bold !important; } diff --git a/deepsea/small.css b/deepsea/small.css index d632c4f..67702b5 100644 --- a/deepsea/small.css +++ b/deepsea/small.css @@ -2,7 +2,9 @@ display: none; } -#pt-watchlist, #pt-preferences, #pt-mycontris { +#pt-watchlist, +#pt-preferences, +#pt-mycontris { display: none; } @@ -13,28 +15,32 @@ margin-right: 0em !important; } -#mw-page-base, #mw-head-base { +#mw-page-base, +#mw-head-base { display:none; } #left-navigation { - left: 0px !important; + left: 0 !important; } + #left-navigation, #right-navigation { top: 2.5em !important; } + #right-navigation { - margin-top: 0px !important; - right: 0px; + margin-top: 0 !important; + right: 0; position: absolute; } div.vectorTabs { height: 2em; } - div.vectorTabs li a { - padding-top: 0.7em; - } + +div.vectorTabs li a { + padding-top: 0.7em; +} #p-search { display:none; @@ -42,9 +48,9 @@ div#mw-panel { position: fixed !important; - top: 0px !important; + top: 0 !important; width: 160px; - margin-top: 0px; + margin-top: 0; z-index: 1; } @@ -57,7 +63,7 @@ } div#footer { - margin: 0px !important; + margin: 0 !important; /*overflow-x: hidden;*/ position: relative; margin-top: 2.5em !important; @@ -76,7 +82,7 @@ } #p-namespaces li:first-of-type { - border-top-left-radius: 0em !important; + border-top-left-radius: 0 !important; } .mobile { @@ -89,21 +95,21 @@ } #p-search-mobile { height: 1.5em; - padding-left: 1em; - padding-top: 0.6em; - padding-bottom: 0.4em; - padding-right: 1em; + padding: .6em 1em .4em 1em; position: absolute; top: -2.5em; right: 0; - border-bottom-left-radius: 1em; + border: 0 0 0 1em; } + #p-search-mobile form, #p-search-mobile input { margin: 0; } -#p-search-mobile input[type=search], #p-search-mobile input[name=search] { - width:8em; + +#p-search-mobile input[type=search], +#p-search-mobile input[name=search] { + width: 8em; } div#simpleSearch { @@ -113,119 +119,133 @@ /*margin-top: 0.65em;*/ position: relative; min-height: 1px; /* Gotta trigger hasLayout for IE7 */ - border: solid 1px #AAAAAA; - color: black; - background-color: white; + border: solid 1px #aaa; + color: #000; + background-color: #fff; } - div#simpleSearch label { - /* - * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent - * this from ever being shown anyways. - */ - font-size: 13px; - top: 0.25em; - direction: ltr; - } - div#simpleSearch input { - color: black; - direction: ltr; - } - div#simpleSearch input:focus { - outline: none; - } - div#simpleSearch input.placeholder { - color: #999999; - } - div#simpleSearch input::-webkit-input-placeholder { - color: #999999; - } - div#simpleSearch input#searchInput { - position: absolute; - top: 0; - left: 0; - width: 90%; - margin: 0; - padding: 0; - padding-left: 0.2em; - padding-top: 0.2em; - padding-bottom: 0.2em; - outline: none; - border: none; - /* - * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent - * this from ever being shown anyways. - */ - font-size: 13px; - background-color: transparent; - direction: ltr; - } - div#simpleSearch button#searchButton { - position: absolute; - right: 5%; - top: 0; - padding: 0; - padding-top: 0.3em; - padding-bottom: 0.2em; - margin: 0; - border: none; - cursor: pointer; - background-color: transparent; - background-image: none; - } - /* OVERRIDDEN BY COMPLIANT BROWSERS */ - div#simpleSearch button#searchButton img { - border: none; - margin: 0; - margin-top: -3px; - padding: 0; - } - /* IGNORED BY IE6 */ - div#simpleSearch button#searchButton > img { - margin: 0; - } + +div#simpleSearch label { + /* + * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent + * this from ever being shown anyways. + */ + font-size: 13px; + top: 0.25em; + direction: ltr; +} + +div#simpleSearch input { + color: #000; + direction: ltr; +} + +div#simpleSearch input:focus { + outline: none; +} + +div#simpleSearch input.placeholder { + color: #999; +} + +div#simpleSearch input::-webkit-input-placeholder { + color: #999; +} + +div#simpleSearch input#searchInput { + position: absolute; + top: 0; + left: 0; + width: 90%; + margin: 0; + padding: .2em 0 .2em .2em; + outline: none; + border: none; + /* + * DON'T PANIC! Browsers that won't scale this properly are the same browsers that have JS issues that prevent + * this from ever being shown anyways. + */ + font-size: 13px; + background-color: transparent; + direction: ltr; +} + +div#simpleSearch button#searchButton { + position: absolute; + right: 5%; + top: 0; + padding: .3em 0 .2em 0; + margin: 0; + border: none; + cursor: pointer; + background-color: transparent; + background-image: none; +} + +/* OVERRIDDEN BY COMPLIANT BROWSERS */ +div#simpleSearch button#searchButton img { + border: none; + margin: 0; + margin-top: -3px; + padding: 0; +} + +/* IGNORED BY IE6 */ +div#simpleSearch button#searchButton > img { + margin: 0; +} /* Fixes glitch. Remove it if it causes other problems. */ #content { width: 100% !important; } + #expander { width: 18px; } -#footer-info, #p-logo { + +#footer-info, +#p-logo { display: none; } + #footer ul { z-index: -1 !important; } + div #footer { position: static; } + .portal { position: relative; top: 10px !important; opacity: 0.9; } + #p-search-mobile { position: fixed; top: -10px !important; right: -20px !important; z-index: 101; } + #p-personal{ position: fixed; top: -2px !important; left: 30px !important; z-index: 100; } + #p-personal li:last-child { - -webkit-border-bottom-right-radius: 20px; - -moz-border-radius-bottomright: 20px; - border-bottom-right-radius: 20px; + border-radius: 0 0 20px 0; } + #p-personal a { - color: #FFF !important; + color: #fff !important; } -#p-views, #p-cactions{ + +#p-views, +#p-cactions { margin-right: -20px !important; } diff --git a/deepsea/special.preferences.styles.css b/deepsea/special.preferences.styles.css index 08d7356..2857d2c 100644 --- a/deepsea/special.preferences.styles.css +++ b/deepsea/special.preferences.styles.css @@ -18,85 +18,99 @@ background-position: bottom left; background-repeat: no-repeat; } - #preftoc li { - /* Tab */ - float: left; - margin: 0; - padding: 0; - padding-right: 1px; - height: 2.25em; - white-space: nowrap; - list-style-type: none; - list-style-image: none; - /* @embed */ - background-image: url(images/preferences-break.png); - background-position: bottom right; - background-repeat: no-repeat; - } - /* Sadly, IE6 won't understand this */ - #preftoc li:first-child { - margin-left: 1px; - } - #preftoc a, - #preftoc a:active { - display: inline-block; - position: relative; - color: #0645ad; - padding: 0.5em; - text-decoration: none; - background-image: none; - font-size: 0.9em; - } - #preftoc a:hover, - #preftoc a:focus { - text-decoration: underline; - } - #preftoc li.selected a { - /* @embed */ - background-image: url(images/preferences-fade.png); - background-position: bottom; - background-repeat: repeat-x; - color: #333333; - text-decoration: none; - } + +#preftoc li { + /* Tab */ + float: left; + margin: 0; + padding: 0; + padding-right: 1px; + height: 2.25em; + white-space: nowrap; + list-style-type: none; + list-style-image: none; + /* @embed */ + background-image: url(images/preferences-break.png); + background-position: bottom right; + background-repeat: no-repeat; +} + +/* Sadly, IE6 won't understand this */ +#preftoc li:first-child { + margin-left: 1px; +} + +#preftoc a, +#preftoc a:active { + display: inline-block; + position: relative; + color: #0645ad; + padding: 0.5em; + text-decoration: none; + background-image: none; + font-size: 0.9em; +} + +#preftoc a:hover, +#preftoc a:focus { + text-decoration: underline; +} + +#preftoc li.selected a { + /* @embed */ + background-image: url(images/preferences-fade.png); + background-position: bottom; + background-repeat: repeat-x; + color: #333; + text-decoration: none; +} + #preferences { float: left; width: 100%; margin: 0; margin-top: -2px; clear: both; - border: solid 1px #cccccc; + border: solid 1px #ccc; background-color: #f9f9f9; /* @embed */ background-image: url(images/preferences-base.png); } + #preferences fieldset { border: none; - border-top: solid 1px #cccccc; + border-top: solid 1px #ccc; } + #preferences fieldset.prefsection { border: none; padding: 0; margin: 1em; } + #preferences legend { - color: #666666; + color: #666; } + #preferences fieldset.prefsection legend.mainLegend { display: none; } + #preferences td { padding-left: 0.5em; padding-right: 0.5em; } + #preferences td.htmlform-tip { font-size: x-small; padding: .2em 2em; - color: #666666; + color: #666; } + #preferences div.mw-prefs-buttons { padding: 1em; } + #preferences div.mw-prefs-buttons input { margin-right: 0.25em; } diff --git a/skin.json b/skin.json index 78d5963..0c8d864 100644 --- a/skin.json +++ b/skin.json @@ -1,7 +1,7 @@ { "name": "DeepSea", "namemsg": "skinname-deepsea", - "version": "1.0.5", + "version": "1.0.6", "author": [ "[https://mediawiki.org/wiki/User:UltrasonicNXT Adam Carter]", "[https://mediawiki.org/wiki/User:GeorgeBarnick George Barnick]", -- To view, visit https://gerrit.wikimedia.org/r/358310 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I843161da9a51dfffe4471ae437fc1c767e74e5b5 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/DeepSea Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> 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