jenkins-bot has submitted this change and it was merged.
Change subject: Hopefully clean up css/less a bit
......................................................................
Hopefully clean up css/less a bit
There is a distinct possibility that this has made things worse.
Change-Id: Ic105b52251d81aca7bf2bead8eaf332bad52be61
---
M resources/main.js
M resources/main.less
M resources/mobile.js.less
M resources/screen-full.less
M resources/screen-mobile.less
M resources/variables.less
M skin.json
7 files changed, 111 insertions(+), 369 deletions(-)
Approvals:
Isarra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/main.js b/resources/main.js
old mode 100644
new mode 100755
index ffbfb62..c0684c6
--- a/resources/main.js
+++ b/resources/main.js
@@ -5,7 +5,7 @@
// When the menus (or their respective little arrows, which are still
// contained in the menu element) are clicked, show their contents.
// CSS/LESS takes care of the users who don't have JS or have it
disabled.
- $( '#p-personal h3, #header-navigation .navigation .mw-portlet h3,
#p-toolbox h3' ).on( 'click', function( e ) {
+ $( '#p-personal h3, #header-navigation .mw-portlet h3, #p-toolbox h3'
).on( 'click', function( e ) {
if ( $( window ).width() > 760 ) {
// Check if it's already open so we don't open it again
if ( $( this ).next( '.dropdown' ).is( ':visible' ) ) {
@@ -20,7 +20,7 @@
} );
$( document ).click( function( e ) {
if ( $( window ).width() > 760 ) {
- if ( $( e.target ).closest( '#p-personal,
#header-navigation .navigation .mw-portlet, #p-toolbox' ).length > 0 ) {
+ if ( $( e.target ).closest( '#p-personal,
#header-navigation .mw-portlet, #p-toolbox' ).length > 0 ) {
// Clicked inside an open menu; don't close
anything
} else {
closeOpen();
@@ -31,7 +31,7 @@
function closeOpen( e ) {
// Close all dropdowns
- $( '#p-personal, #header-navigation .navigation .mw-portlet,
#p-toolbox' ).children( '.dropdown' ).each( function() {
+ $( '#p-personal, #header-navigation .mw-portlet, #p-toolbox'
).children( '.dropdown' ).each( function() {
if ( $( window ).width() > 760 ) {
if ( $( this ).is( ':visible' ) ) {
// .closest() doesn't work here like it does
above...
diff --git a/resources/main.less b/resources/main.less
index 5102b1c..ac79f3a 100644
--- a/resources/main.less
+++ b/resources/main.less
@@ -1,4 +1,3 @@
-@import "mediawiki.mixins";
@import "variables.less";
body {
@@ -12,26 +11,6 @@
}
#content-header .mobileClear {
display: none;
-}
-.client-nojs {
- /* need to specify #header-container to have the style actually applied,
- * otherwise some stupid display: none; somewhere overrides it. Yay for
- * cascading!
- */
- div#header-container {
- /* Allow the menus to remain usable even when JS isn't
available/enabled */
- div#p-personal {
- &:hover {
- .dropdown {
- display: block;
- }
- h3 {
- background-position: 100% 90%;
-
.background-image-svg('images/arrow-down.svg', 'images/arrow-down.png');
- }
- }
- }
- }
}
a {
text-decoration: none;
@@ -99,121 +78,78 @@
* HEADER STUFF
*
*/
+#header-top-container {
+ padding: .5em 1.5em;
+}
+#header-top {
+ padding: 0;
+ font-size: 95%;
+}
-#header-container {
+/* Banner stuff */
+.mw-wiki-logo {
+ display: block;
+ width: 66px;
+ height: 66px;
+ float: left;
+ background-position: center center;
+ background-repeat: no-repeat;
+ background-size: contain;
+ margin-right: 1em;
+}
+#p-banner {
+ float: left;
- #header-top-container {
- padding: .5em 1.5em;
- }
- #header-top {
- padding: 0;
- font-size: 95%;
- }
+ #sitetitle {
+ padding-top: .25em;
- /* Banner stuff */
- .mw-wiki-logo {
- display: block;
- width: 66px;
- height: 66px;
- float: left;
- background-position: center center;
- background-repeat: no-repeat;
- background-size: contain;
- margin-right: 1em;
- }
- #p-banner {
- float: left;
+ a {
+ font-size: 210%;
+ font-weight: bold;
+ line-height: 140%;
+ color: #999;
+ /* @noflip */
+ text-shadow: 0 -1px 0 #333, 0 2px 1px #fff;
- #sitetitle {
- padding-top: .25em;
-
- a {
- font-size: 210%;
- font-weight: bold;
- line-height: 140%;
- color: #999;
- /* @noflip */
- text-shadow: 0 -1px 0 #333, 0 2px 1px #fff;
-
- &:hover {
- text-decoration: none;
- }
- }
- }
- #sitesubtitle {
- font-style: italic;
- font-size: 85%;
- line-height: 1.2em;
- }
- }
-
- /* Search stuff */
- #p-search {
- float: right;
- clear: right;
- margin-top: .5em;
- margin-top: -2px ~"!ie";
- margin-bottom: 0;
- margin-bottom: -8px ~"!ie";
- font-size: 85%;
-
- h3 {
- position: absolute;
- top: -9999px;
- }
-
- #searchInput-container-container {
- display: inline-block;
- }
- #searchInput {
- width: 20em;
- border: solid 1px #ccc;
- }
- #searchGoButton {
- border: solid 1px #bbb;
- height: 30px ~"!ie";
- min-width: 4em;
- margin: 8px 0 ~"!ie";
- }
- }
-
- /* Login stuff */
- #p-personal {
- float: right;
- color: @text-grey;
- font-size: 85%;
- position: relative;
-
- .dropdown {
- display: none;
- }
- #p-welcome {
- margin: .25em 0;
- font-size: 1em;
- line-height: 1.3;
- background-repeat: no-repeat;
- background-position: 100% 30%;
- .background-image-svg('images/arrow-down.svg',
'images/arrow-down.png');
- padding: 0 1.75em .3em 0;
-
- /* Dropdown stuff */
&:hover {
- cursor: pointer;
+ text-decoration: none;
}
}
+ }
+ #sitesubtitle {
+ font-style: italic;
+ font-size: 85%;
+ line-height: 1.2em;
+ }
+}
- /**
- * No-JS and JS versions, respectively
- * Without the latter rule there's some weird flickering and
whatnot
- * with the personal tools menu due to the JS. I have no idea
what or
- * why, but this seems to fix it...
- */
- &:hover .dropdown,
- .dropdown {
- .generic-dropdown;
- left: auto;
- right: 0;
- }
+/* Search stuff */
+#p-search {
+ float: right;
+ clear: right;
+ margin-top: .5em;
+ margin-top: -2px ~"!ie";
+ margin-bottom: 0;
+ margin-bottom: -8px ~"!ie";
+ font-size: 85%;
+
+ h3 {
+ position: absolute;
+ top: -9999px;
+ }
+
+ #searchInput-container-container {
+ display: inline-block;
+ }
+ #searchInput {
+ width: 20em;
+ border: solid 1px #ccc;
+ }
+ #searchGoButton {
+ border: solid 1px #bbb;
+ height: 30px ~"!ie";
+ min-width: 4em;
+ margin: 8px 0 ~"!ie";
}
}
@@ -291,212 +227,6 @@
clear: both;
}
-
-/*
- *
- * PREFERENCES AND FIELDSET STUFF
- *
- */
-#preftoc {
- margin: 0 0 1em;
- padding: 0;
- list-style: none;
- clear: both;
-
- li {
- display: inline;
- margin-right: 1em;
-
- &.selected {
- border-bottom: solid 3px @soft-border;
-
- a {
- color: #000;
- }
- }
- a {
- color: @link-grey;
- }
- }
-}
-#preferences {
- margin: 0;
- clear: both;
- min-height: 400px;
-
- .prefsection {
- border: none;
- padding: 0;
- margin: 0;
- }
- .mainLegend {
- display: none;
- }
- .preferences-login {
- clear: both;
- margin-bottom: 1.5em;
- }
- .mw-email-not-authenticated .mw-input, .mw-email-none .mw-input {
- display: block;
- }
-}
-
-/*
- *
- * FORM STUFF
- *
- */
-
-/* pile of bad hacks to try to catch all the different ones */
-#searchInput,
-input[name="target"],
-input[name="user"],
-input[name="mime"],
-input[size$="0"],
-input[type="text"],
-input[type="checkbox"],
-input[type="radio"],
-input#wpTemplateSandboxPage,
-input.mw-summary,
-input.mw-input,
-.mw-input input,
-textarea,
-.mw-ui-input-inline {
- padding: .35em;
- box-shadow: 0 1px 4px -1px #ccc inset;
- border: solid 1px @bold-border;
- margin: .5em 0;
-}
-select {
- padding: .2em;
- margin: .5em 0;
-}
-#searchInput,
-input[type="submit"].searchButton {
- padding: .45em;
- margin: 0;
-}
-input[type="radio"] {
- border-radius: 7px;
-}
-input[type="submit"],
-input[type="button"],
-button {
- padding: .35em 1em;
- border: solid 1px #ccc;
- border-radius: 3px;
- box-shadow: none;
- .vertical-gradient ( #fcfcfc, #ededed, 0, 100% );
-
- &:active {
- .vertical-gradient ( #fff, #f6f6f6, 0, 100% );
- }
-}
-textarea {
- width: 100%;
- resize: vertical;
- box-sizing: border-box;
- line-height: 1.3em;
-}
-div.editOptions {
- background: #fff;
- border-bottom: solid 1px @soft-border;
- padding: 1em 0;
-
- .mw-summary label {
- padding-left: 0;
- }
- input#wpSummary {
- box-sizing: border-box;
- width: 100%;
- }
- label {
- margin-right: 1.5em;
- }
-}
-td.mw-input,
-td.mw-label {
- vertical-align: middle;
-}
-
-fieldset {
- border: 1px @bold-border;
- border-style: solid none none;
- line-height: 1.3em;
- margin: 1em 0;
- padding: 1.5em 0 0 0;
-
- legend {
- padding: 0 1em;
- text-shadow: 0 0 1px #999;
- margin-left: 1em;
- }
-}
-label {
- padding-left: .5em;
-}
-.mw-input label {
- padding: 0;
- margin-right: 1em;
-}
-.mw-label {
- padding-right: .5em;
-}
-.mw-submit {
- padding-top: 2em;
-}
-.htmlform-tip {
- font-size: 85%;
- color: @text-grey;
- line-height: 1.2em;
- padding: 1em 0;
-}
-
-/* Recent changes and watchlist options */
-.rcoptions hr,
-#mw-watchlist-options hr {
- clear: both;
-}
-.rcoptions #namespace,
-#mw-watchlist-options .namespaceselector {
- margin-right: 2em;
-}
-
-/* Watchlist */
-#mw-watchlist-options {
- label {
- padding: 0 1em 0 0;
- }
- input[type="submit"] {
- margin: 0 0 0 4em;
- }
-}
-
-/* Related changes hacks */
-.mw-special-Recentchangeslinked {
- .rcoptions {
- input[type="submit"] {
- float: right;
- margin: 0 0 0 4em;
- }
- td.mw-label.mw-target-label {
- vertical-align: top;
- padding-top: .75em;
- }
- input[name="target"] {
- float: left;
- }
- }
- #showlinkedto {
- clear: left;
- float: left;
- }
- label[for="showlinkedto"] {
- padding: .4em;
- float: left;
- }
-}
-
/*
*
* Content header
@@ -560,7 +290,6 @@
}
}
-
/*
*
* CONTENT STUFF
@@ -583,11 +312,6 @@
font-weight: normal;
color: @header-grey;
margin: 2em 0 .5em;
-}
-h1 .mw-editsection,
-h2 .mw-editsection,
-h3, h4, h5, h6, dt {
- font-variant: normal;
}
#mw-content-text {
h1, h2 {
@@ -671,7 +395,9 @@
color: @link-grey;
}
}
-#toc, .toc, .mw-warning {
+#toc,
+.toc,
+.mw-warning {
font-size: 95%;
padding: 1em 0 .5em 0;
border-bottom: solid 1px @soft-border;
diff --git a/resources/mobile.js.less b/resources/mobile.js.less
index 76b0efd..07ad21b 100644
--- a/resources/mobile.js.less
+++ b/resources/mobile.js.less
@@ -1,6 +1,5 @@
/* js stuff */
-@import "mediawiki.mixins";
@import "variables.less";
/* For the footer menus */
@@ -61,7 +60,6 @@
}
/* Make navigation and personal menu base states consistent and crap */
-#header-container #p-personal:hover .dropdown,
#header-container #p-personal .dropdown {
display: block;
border: none;
diff --git a/resources/screen-full.less b/resources/screen-full.less
index 6b16d9c..4f29a12 100644
--- a/resources/screen-full.less
+++ b/resources/screen-full.less
@@ -1,26 +1,46 @@
-@import "mediawiki.mixins";
@import "variables.less";
/*
* Navigation menus
-*
-* Some stuff shared/duplicated with personal menu(?)
*/
+
+#header-navigation .mw-portlet .dropdown,
+#p-personal .dropdown {
+ display: none;
+}
.client-nojs {
- #header-navigation {
- .mw-portlet {
- &.mw-portlet:hover {
- .p-body {
- transition-property: height;
- transition-duration: 1s;
- display: block;
- }
- h3 {
- background-position: 100% 90%;
-
.background-image-svg('images/arrow-down.svg', 'images/arrow-down.png');
- }
- }
+ #header-navigation .mw-portlet:hover .dropdown,
+ #p-personal:hover .dropdown {
+ display: block;
+ }
+}
+
+/* Login stuff */
+#p-personal {
+ float: right;
+ color: @text-grey;
+ font-size: 85%;
+ position: relative;
+
+ #p-welcome {
+ margin: .25em 0;
+ font-size: 1em;
+ line-height: 1.3;
+ background-repeat: no-repeat;
+ background-position: 100% 30%;
+ .background-image-svg('images/arrow-down.svg',
'images/arrow-down.png');
+ padding: 0 1.75em .3em 0;
+
+ /* Dropdown stuff */
+ &:hover {
+ cursor: pointer;
}
+ }
+
+ .dropdown {
+ .generic-dropdown;
+ left: auto;
+ right: 0;
}
}
@@ -56,11 +76,6 @@
.background-image-svg('images/arrow-down.svg',
'images/arrow-down.png');
text-shadow: none;
- &.menu-down-arrow {
- background-position: 100% 90%;
- .background-image-svg('images/arrow-down.svg',
'images/arrow-down.png');
- }
-
&:hover {
cursor: pointer;
}
@@ -71,7 +86,6 @@
display: inline-block;
.p-body {
- display: none;
font-size: 90%;
.generic-dropdown;
}
diff --git a/resources/screen-mobile.less b/resources/screen-mobile.less
index 83f1a45..988e091 100644
--- a/resources/screen-mobile.less
+++ b/resources/screen-mobile.less
@@ -17,7 +17,7 @@
/* misc */
#content-header {
- border-bottom: solid 1px @soft-border;
+ border-bottom: none;
}
#content {
overflow: auto;
diff --git a/resources/variables.less b/resources/variables.less
index cb9ca07..29012e5 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -1,3 +1,4 @@
+@import "mediawiki.mixins";
/* Element colours */
@bold-bkg: #f3f3f3;
diff --git a/skin.json b/skin.json
index d84db46..53b8d4c 100644
--- a/skin.json
+++ b/skin.json
@@ -31,6 +31,9 @@
"resources/normalise.css": {
"media": "screen"
},
+ "resources/forms.less": {
+ "media": "screen"
+ },
"resources/main.less": {
"media": "screen"
},
--
To view, visit https://gerrit.wikimedia.org/r/248587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic105b52251d81aca7bf2bead8eaf332bad52be61
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Isarra <[email protected]>
Gerrit-Reviewer: Isarra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
