diff options
48 files changed, 149 insertions, 55 deletions
diff --git a/mw-config/config.css b/mw-config/config.css index 2468c71563a5..1b2574d58939 100644 --- a/mw-config/config.css +++ b/mw-config/config.css @@ -10,7 +10,6 @@ .config-block { margin-top: 2em; display: block; - } .config-block-label { diff --git a/package.json b/package.json index ac26a537b355..e3379cab8353 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "karma-qunit": "2.1.0", "postcss-less": "2.0.0", "qunit": "2.6.2", - "stylelint": "9.2.0", - "stylelint-config-wikimedia": "0.4.3", + "stylelint": "9.6.0", + "stylelint-config-wikimedia": "0.5.0", "wdio-junit-reporter": "0.2.0", "wdio-mediawiki": "file:tests/selenium/wdio-mediawiki", "wdio-mocha-framework": "0.5.13", diff --git a/resources/src/jquery.tipsy/jquery.tipsy.css b/resources/src/jquery.tipsy/jquery.tipsy.css index 9036dd3c561e..ea6070232785 100644 --- a/resources/src/jquery.tipsy/jquery.tipsy.css +++ b/resources/src/jquery.tipsy/jquery.tipsy.css @@ -4,9 +4,10 @@ z-index: 100000; cursor: default; } + .tipsy-inner { padding: 5px 8px 4px 8px; - /*background-color: #e8f2f8;*/ + /* background-color: #e8f2f8; */ background-color: #fff; border: solid 1px #a7d7f9; color: #000; @@ -20,6 +21,7 @@ filter: progid:DXImageTransform.Microsoft.DropShadow(OffX=0, OffY=2, Strength=6, Direction=90, Color='#cccccc'); */ } + .tipsy-arrow { position: absolute; /* @embed */ @@ -27,36 +29,50 @@ width: 11px; height: 6px; } -/* @noflip */ .tipsy-n .tipsy-arrow { + +/* @noflip */ +.tipsy-n .tipsy-arrow { top: 0; left: 50%; margin-left: -5px; } -/* @noflip */ .tipsy-nw .tipsy-arrow { + +/* @noflip */ +.tipsy-nw .tipsy-arrow { top: 0; left: 10px; } -/* @noflip */ .tipsy-ne .tipsy-arrow { + +/* @noflip */ +.tipsy-ne .tipsy-arrow { top: 0; right: 10px; } -/* @noflip */ .tipsy-s .tipsy-arrow { + +/* @noflip */ +.tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; background-position: bottom left; } -/* @noflip */ .tipsy-sw .tipsy-arrow { + +/* @noflip */ +.tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; background-position: bottom left; } -/* @noflip */ .tipsy-se .tipsy-arrow { + +/* @noflip */ +.tipsy-se .tipsy-arrow { bottom: 0; right: 10px; background-position: bottom left; } -/* @noflip */ .tipsy-e .tipsy-arrow { + +/* @noflip */ +.tipsy-e .tipsy-arrow { top: 50%; margin-top: -5px; right: 0; @@ -64,7 +80,9 @@ height: 11px; background-position: top right; } -/* @noflip */ .tipsy-w .tipsy-arrow { + +/* @noflip */ +.tipsy-w .tipsy-arrow { top: 50%; margin-top: -5px; left: 0; diff --git a/resources/src/jquery/jquery.makeCollapsible.css b/resources/src/jquery/jquery.makeCollapsible.css index fc52d5173e76..bc379439dc59 100644 --- a/resources/src/jquery/jquery.makeCollapsible.css +++ b/resources/src/jquery/jquery.makeCollapsible.css @@ -12,9 +12,11 @@ -ms-user-select: none; user-select: none; } + .mw-collapsible-toggle-default:before { content: '['; } + .mw-collapsible-toggle-default:after { content: ']'; } @@ -24,7 +26,7 @@ cursor: pointer; } -/* collapse links in captions should be inline */ +/* Collapse links in captions should be inline */ caption .mw-collapsible-toggle, .mw-content-ltr caption .mw-collapsible-toggle, .mw-content-rtl caption .mw-collapsible-toggle, diff --git a/resources/src/jquery/jquery.makeCollapsible.styles.less b/resources/src/jquery/jquery.makeCollapsible.styles.less index ea5b6dd0931b..1ab91a93bdd1 100644 --- a/resources/src/jquery/jquery.makeCollapsible.styles.less +++ b/resources/src/jquery/jquery.makeCollapsible.styles.less @@ -25,7 +25,6 @@ @exclude: ~'.mw-made-collapsible'; .client-js { - ol.mw-collapsible:before, ul.mw-collapsible:before, .mw-collapsible-toggle-li { @@ -76,8 +75,7 @@ // Avoid FOUC/reflows on collapsed elements by making sure they are opened by default (T42812) > p, > table, - // Manual:Collapsible_elements/Demo/Simple#Collapsed_by_default - > thead + tbody, + > thead + tbody, // 'https://www.mediawiki.org/wiki/Manual:Collapsible_elements/Demo/Simple#Collapsed_by_default' tr:not( :first-child ), .mw-collapsible-content { display: none; diff --git a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less index a481074b5ae6..abdee120b7ff 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less +++ b/resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less @@ -3,11 +3,13 @@ .mw-category { .column-count(3); .column-width(24em); + .mw-category-group { ul { margin-top: 0; margin-bottom: 0; } + li { .column-break-inside-avoid; } diff --git a/resources/src/mediawiki.apihelp.css b/resources/src/mediawiki.apihelp.css index d3e49500f520..7528fdbb302c 100644 --- a/resources/src/mediawiki.apihelp.css +++ b/resources/src/mediawiki.apihelp.css @@ -97,9 +97,11 @@ div.apihelp-linktrail { .api-main-links { text-align: center; } + .api-main-links ul:before { content: '['; } + .api-main-links ul:after { content: ']'; } diff --git a/resources/src/mediawiki.feedback/feedback.css b/resources/src/mediawiki.feedback/feedback.css index ac33b8468588..92e1d04d0716 100644 --- a/resources/src/mediawiki.feedback/feedback.css +++ b/resources/src/mediawiki.feedback/feedback.css @@ -21,11 +21,12 @@ margin-bottom: 1em; } -/* Overwriting OOUI is no fun */ +/* Overwriting OOUI */ .mw-feedbackDialog-feedback-form .oo-ui-fieldLayout.oo-ui-labelElement.oo-ui-fieldLayout-align-left > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header { min-width: 4.2em; width: 20%; } + .mw-feedbackDialog-feedback-form .oo-ui-fieldLayout.oo-ui-labelElement.oo-ui-fieldLayout-align-left > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field { width: 80%; } diff --git a/resources/src/mediawiki.hlist/default.css b/resources/src/mediawiki.hlist/default.css index 2663d8737082..e25a92fb7740 100644 --- a/resources/src/mediawiki.hlist/default.css +++ b/resources/src/mediawiki.hlist/default.css @@ -6,22 +6,26 @@ .hlist dt:after { content: ':'; } + .hlist dd:after, .hlist li:after { content: ' ยท'; font-weight: bold; } + .hlist dd:last-child:after, .hlist dt:last-child:after, .hlist li:last-child:after { content: none; } + /* For IE8 */ .hlist dd.hlist-last-child:after, .hlist dt.hlist-last-child:after, .hlist li.hlist-last-child:after { content: none; } + /* Add parentheses around nested lists */ .hlist dd dd:first-child:before, .hlist dd dt:first-child:before, @@ -35,6 +39,7 @@ content: '('; font-weight: normal; } + .hlist dd dd:last-child:after, .hlist dd dt:last-child:after, .hlist dd li:last-child:after, @@ -47,6 +52,7 @@ content: ')'; font-weight: normal; } + /* For IE8 */ .hlist dd dd.hlist-last-child:after, .hlist dd dt.hlist-last-child:after, @@ -60,16 +66,20 @@ content: ')'; font-weight: normal; } + /* Put ordinals in front of ordered list items */ .hlist ol { counter-reset: list-item; } + .hlist ol > li { counter-increment: list-item; } + .hlist ol > li:before { content: counter( list-item ) ' '; } + .hlist dd ol > li:first-child:before, .hlist dt ol > li:first-child:before, .hlist li ol > li:first-child:before { diff --git a/resources/src/mediawiki.htmlform.ooui.styles.less b/resources/src/mediawiki.htmlform.ooui.styles.less index 3feb9a19baca..8f1d563ebd16 100644 --- a/resources/src/mediawiki.htmlform.ooui.styles.less +++ b/resources/src/mediawiki.htmlform.ooui.styles.less @@ -78,9 +78,9 @@ } } -// Flatlist styling for PHP widgets... +// Flatlist styling for PHP (`.oo-ui-fieldLayout-align-inline`) & +// JS (`.oo-ui-radioOptionWidget, .oo-ui-checkboxMultioptionWidget`) widgets .mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline, -// ...and for JS widgets .mw-htmlform-flatlist .oo-ui-radioOptionWidget, .mw-htmlform-flatlist .oo-ui-checkboxMultioptionWidget { display: inline-block; diff --git a/resources/src/mediawiki.htmlform.styles/styles.css b/resources/src/mediawiki.htmlform.styles/styles.css index 1c69a75dff18..d9432198bedf 100644 --- a/resources/src/mediawiki.htmlform.styles/styles.css +++ b/resources/src/mediawiki.htmlform.styles/styles.css @@ -47,7 +47,6 @@ tr.mw-htmlform-vertical-label td.mw-label { margin-left: 4px; } -/* stylelint-disable indentation */ .mw-icon-question:lang( ar ), .mw-icon-question:lang( fa ), .mw-icon-question:lang( ur ) { diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less b/resources/src/mediawiki.less/mediawiki.mixins.less index 7e7821ef68b5..fe5647f54f64 100644 --- a/resources/src/mediawiki.less/mediawiki.mixins.less +++ b/resources/src/mediawiki.less/mediawiki.mixins.less @@ -54,7 +54,7 @@ } .hyphens( @value: auto ) { - & when ( @value = auto ){ + & when ( @value = auto ) { // Legacy `word-wrap`; IE 6-11, Edge 12+, Firefox 3.5+, Chrome 4+, Safari 3.1+, // Opera 11.5+, iOS 3.2+, Android 2.1+ // `overflow-wrap` is W3 standard, but it doesn't seem as if browser vendors @@ -92,7 +92,6 @@ // and remaining parameters are additional transitions." .transition-transform( ... ) { -webkit-backface-visibility: hidden; // Older Webkit browsers: Promote element to a composite layer & involve the GPU - -webkit-transition: -webkit-transform @arguments; // Safari 3.1-8, iOS 3.2-8.4, Android 2.1-4.4.4 -moz-transition: -moz-transform @arguments; // Firefox 4-15 for `-moz-transition` transition: transform @arguments; // Chrome 36+, Firefox 16+, IE 10+, Safari 9+, Opera 12.1+, iOS 9.2+, Android 36+ @@ -153,10 +152,8 @@ -webkit-box-flex: @grow; // iOS 6-, Safari 3.1-6 -moz-box-flex: @grow; // Firefox 21- width: @width; // Fallback for flex-basis - -ms-flex: @grow @shrink @width; // IE 10 flex: @grow @shrink @width; - -webkit-box-ordinal-group: @order; // iOS 6-, Safari 3.1-6 -moz-box-ordinal-group: @order; // Firefox 21- -ms-flex-order: @order; // IE 10 diff --git a/resources/src/mediawiki.less/mediawiki.mixins.rotation.less b/resources/src/mediawiki.less/mediawiki.mixins.rotation.less index 64d6b3d680a4..ccc9564f5b40 100644 --- a/resources/src/mediawiki.less/mediawiki.mixins.rotation.less +++ b/resources/src/mediawiki.less/mediawiki.mixins.rotation.less @@ -7,6 +7,7 @@ from { .transform-rotate( 0deg ); } + to { .transform-rotate( 360deg ); } diff --git a/resources/src/mediawiki.notification/default.css b/resources/src/mediawiki.notification/default.css index a56be7608614..c36b8d8ca731 100644 --- a/resources/src/mediawiki.notification/default.css +++ b/resources/src/mediawiki.notification/default.css @@ -17,7 +17,6 @@ background-color: #fff; /* Click handler in mediawiki.notification.js */ cursor: pointer; - opacity: 0; -webkit-transform: translateX( 35px ); transform: translateX( 35px ); diff --git a/resources/src/mediawiki.page.gallery.styles/print.css b/resources/src/mediawiki.page.gallery.styles/print.css index 047c93364e25..f7a3f0ddbda6 100644 --- a/resources/src/mediawiki.page.gallery.styles/print.css +++ b/resources/src/mediawiki.page.gallery.styles/print.css @@ -56,4 +56,3 @@ ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapp white-space: normal; overflow: visible; } - diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less index 9101fba69b58..689f3229fa3c 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less @@ -24,7 +24,6 @@ // On the watchlist, reserve a bit more .mw-special-Watchlist .rcfilters-head { min-height: @rcfilters-wl-head-min-height; - } .mw-rcfilters-collapsed { @@ -79,7 +78,6 @@ .cloptions { display: none; } - } } @@ -139,11 +137,13 @@ .animation-delay( 0s ); } } + body:not( .mw-rcfilters-ui-initialized ) .rcfilters-spinner { display: block; // When initializing, display the spinner on top of the area where the UI will appear margin-top: -( @rcfilters-head-min-height + @rcfilters-head-margin-bottom ) / 1.5; } + body.mw-rcfilters-ui-loading .rcfilters-spinner { display: block; // When loading new results, display the spinner on top of the results area @@ -183,6 +183,7 @@ 100% { -webkit-transform: scale( 0.625 ); } + 20% { // equals 320ms opacity: 0.87; -webkit-transform: scale( 1 ); @@ -195,6 +196,7 @@ 100% { -moz-transform: scale( 0.625 ); } + 20% { opacity: 0.87; -moz-transform: scale( 1 ); @@ -207,6 +209,7 @@ 100% { transform: scale( 0.625 ); } + 20% { // equals 320ms opacity: 0.87; transform: scale( 1 ); diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.highlightCircles.seenunseen.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.highlightCircles.seenunseen.less index 516a79b21fe5..96a791f6208e 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.highlightCircles.seenunseen.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.highlightCircles.seenunseen.less @@ -41,7 +41,6 @@ div.mw-rcfilters-ui-highlights { .mw-rcfilters-circle-color( @highlight-bluedot, true, @highlight-bluedot ); } } - } // Watchlist unseen highlighted fixes diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less index 16f110a6c864..87f257bfd91b 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less @@ -6,6 +6,7 @@ 60% { border-top-color: @colorProgressive; } + 100% { border-top-color: @colorGray12; } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less index 93fae1eaf3d9..d74f4d08ae31 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less @@ -14,15 +14,19 @@ &-c1 { .mw-rcfilters-circle-color( @highlight-c1 ); } + &-c2 { .mw-rcfilters-circle-color( @highlight-c2 ); } + &-c3 { .mw-rcfilters-circle-color( @highlight-c3 ); } + &-c4 { .mw-rcfilters-circle-color( @highlight-c4 ); } + &-c5 { .mw-rcfilters-circle-color( @highlight-c5 ); } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less index aa285e6ebfa8..d67739d20cce 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less @@ -78,6 +78,7 @@ padding: 0.6em 0; // Same top padding as the handle flex: 0 0 auto; } + &-queryName { flex: 1 1 auto; padding: 0.6em 0; // Same top padding as the handle diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less index e6003c112442..949980d75e7b 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less @@ -12,7 +12,6 @@ &-bottom { .flex-display; .flex; - margin-top: 1em; } } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less index deecd67eaf91..4fa51838a242 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less @@ -50,6 +50,7 @@ background-color: @highlight-none; } } + &-c1 { .mw-rcfilters-circle-color( @highlight-c1, false ); border-color: @highlight-c1; @@ -60,6 +61,7 @@ background-color: @highlight-c1; } } + &-c2 { .mw-rcfilters-circle-color( @highlight-c2, true ); border-color: @highlight-c2; @@ -70,6 +72,7 @@ background-color: @highlight-c2; } } + &-c3 { .mw-rcfilters-circle-color( @highlight-c3, true ); border-color: @highlight-c3; @@ -80,6 +83,7 @@ background-color: @highlight-c3; } } + &-c4 { .mw-rcfilters-circle-color( @highlight-c4, true ); border-color: @highlight-c4; @@ -90,6 +94,7 @@ background-color: @highlight-c4; } } + &-c5 { .mw-rcfilters-circle-color( @highlight-c5, true ); border-color: @highlight-c5; diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less index 61872bddba31..5c3c0dfe173a 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less @@ -14,9 +14,8 @@ border-top: 4px solid @colorGray12; } - // Don't show border for first namespace + // Don't show border for first namespace & hide for every 'talk' option in second selector &-view-default + &-view-namespaces, - // Hide for every 'talk' option &-view-namespaces&.mw-rcfilters-ui-itemMenuOptionWidget-identifier-subject + &-view-namespaces.mw-rcfilters-ui-itemMenuOptionWidget-identifier-talk { border-top: 0; } @@ -40,6 +39,7 @@ font-size: 1.15em; color: @colorGray2; } + &-desc { color: @colorGray5; white-space: normal; diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less index f210a445252d..e593966f3eed 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less @@ -33,10 +33,12 @@ .transform( scale( 0 ) ); opacity: 1; } + 50% { .transform( scale( 1.5 ) ); opacity: 0.8; } + 80%, 100% { opacity: 0; diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less index 4e8ad5672183..9f9378a4a06e 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less @@ -35,5 +35,4 @@ } } } - } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less index 701eb7226d27..66df70bf547f 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less @@ -58,5 +58,4 @@ width: 100%; line-height: normal; } - } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less index 824485f877fb..31a5f5414b9b 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less @@ -16,6 +16,7 @@ .oo-ui-labelElement-label { color: @colorGray7; } + .oo-ui-buttonWidget { opacity: @muted-opacity; } diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css index 29570808953b..3104a69a0e0f 100644 --- a/resources/src/mediawiki.skinning/content.css +++ b/resources/src/mediawiki.skinning/content.css @@ -34,7 +34,6 @@ /* IE7 and earlier */ zoom: 1; *display: inline; /* stylelint-disable declaration-block-no-duplicate-properties */ - padding: 7px; } diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less index 3f3383753479..8b2657d4b0ed 100644 --- a/resources/src/mediawiki.skinning/content.parsoid.less +++ b/resources/src/mediawiki.skinning/content.parsoid.less @@ -120,6 +120,7 @@ figure[ typeof~='mw:Audio/Frame' ] { /* @noflip */ margin: 0.5em 1.4em 1.3em 0; } + &.mw-halign-right { /* @noflip */ margin: 0.5em 0 1.3em 1.4em; @@ -198,6 +199,7 @@ figure[ typeof*='mw:Audio/Thumb' ] { display: inline-block; height: 100%; } + > * { vertical-align: middle; display: inline-block; @@ -213,24 +215,31 @@ figure[ typeof*='mw:Audio/Thumb' ] { .mw-valign-middle > & { vertical-align: middle; } + .mw-valign-baseline > & { vertical-align: baseline; } + .mw-valign-sub > & { vertical-align: sub; } + .mw-valign-super > & { vertical-align: super; } + .mw-valign-top > & { vertical-align: top; } + .mw-valign-text-top > & { vertical-align: text-top; } + .mw-valign-bottom > & { vertical-align: bottom; } + .mw-valign-text-bottom > & { vertical-align: text-bottom; } diff --git a/resources/src/mediawiki.skinning/elements.css b/resources/src/mediawiki.skinning/elements.css index 301024df9e4a..db9265a02965 100644 --- a/resources/src/mediawiki.skinning/elements.css +++ b/resources/src/mediawiki.skinning/elements.css @@ -53,10 +53,12 @@ a.mw-selflink { font-weight: bold; text-decoration: inherit; } + a.mw-selflink:hover { cursor: inherit; text-decoration: inherit; } + a.mw-selflink:active, a.mw-selflink:visited { color: inherit; diff --git a/resources/src/mediawiki.special.block.less b/resources/src/mediawiki.special.block.less index c01399475641..c319294c50a8 100644 --- a/resources/src/mediawiki.special.block.less +++ b/resources/src/mediawiki.special.block.less @@ -1,5 +1,6 @@ .mw-block-page-restrictions { margin-left: 2em; + .oo-ui-widget { max-width: 48em; } diff --git a/resources/src/mediawiki.special.changeslist.less b/resources/src/mediawiki.special.changeslist.less index c87a8a149931..db33f4abf70c 100644 --- a/resources/src/mediawiki.special.changeslist.less +++ b/resources/src/mediawiki.special.changeslist.less @@ -75,6 +75,7 @@ &:before { content: '@{msg-parentheses-start}'; } + &:after { content: '@{msg-parentheses-end}'; } diff --git a/resources/src/mediawiki.special.preferences.styles.css b/resources/src/mediawiki.special.preferences.styles.css index 5869303a63d4..37d3a1655061 100644 --- a/resources/src/mediawiki.special.preferences.styles.css +++ b/resources/src/mediawiki.special.preferences.styles.css @@ -17,6 +17,7 @@ #preferences > fieldset table { width: 100%; } + #preferences > fieldset table.mw-htmlform-matrix { width: auto; } diff --git a/resources/src/mediawiki.special.search.interwikiwidget.styles.less b/resources/src/mediawiki.special.search.interwikiwidget.styles.less index 7265399a20cc..81c8dc98610a 100644 --- a/resources/src/mediawiki.special.search.interwikiwidget.styles.less +++ b/resources/src/mediawiki.special.search.interwikiwidget.styles.less @@ -1,11 +1,10 @@ -/* interwiki search results */ -/*==========================*/ +/* Interwiki search results */ +/* ======================== */ @import 'mediawiki.ui/variables.less'; @import 'mediawiki.mixins'; .mw-searchresults-has-iw { - .iw-headline { font-weight: bold; } @@ -27,11 +26,11 @@ } .iw-result__title { - font-size: 108%; /* matching regular search title */ + font-size: 108%; /* Matching regular search title */ } .iw-result:after, - .iw-result__content:after { /* clearfix */ + .iw-result__content:after { /* Clearfix */ visibility: hidden; display: block; font-size: 0; @@ -42,9 +41,10 @@ .iw-result__footer { float: right; - font-size: 97%; /* matching main search result font-size */ + font-size: 97%; /* Matching main search result font-size */ margin-top: 0.5em; } + .iw-result__footer a { vertical-align: middle; font-style: italic; @@ -54,7 +54,7 @@ padding-right: 1em; } - /* image search result */ + /* Image search result */ .iw-result__mini-gallery { position: relative; float: left; @@ -64,7 +64,7 @@ padding: 0.25rem; } - /* second and third images are small */ + /* Second and third images are small */ .iw-result__mini-gallery:nth-child( 2 ), .iw-result__mini-gallery:nth-child( 3 ) { /* stylelint-disable-line indentation */ width: 50%; @@ -82,7 +82,7 @@ background-position: center center; } - /* image gallery text */ + /* Image gallery text */ .iw-result__mini-gallery__image > .iw-result__mini-gallery__caption { visibility: hidden; position: absolute; @@ -99,15 +99,14 @@ visibility: visible; } - /* tablet and up */ - + /* Tablet and up */ @media only screen and ( min-width: @width-breakpoint-tablet ) { - #mw-interwiki-results { width: 30%; - display: inline-block; /* used to align interwiki sidebar with the top of the main search results */ - margin-left: 8%; /* since inline-block causes whitespace issues, this is 8 instead of 10% */ + display: inline-block; /* Used to align interwiki sidebar with the top of the main search results */ + margin-left: 8%; /* Since inline-block causes whitespace issues, this is 8 instead of 10% */ } + .mw-search-createlink, .mw-search-nonefound, .mw-search-results, diff --git a/resources/src/mediawiki.special.search.styles.css b/resources/src/mediawiki.special.search.styles.css index 59a15a97b804..1179f9048452 100644 --- a/resources/src/mediawiki.special.search.styles.css +++ b/resources/src/mediawiki.special.search.styles.css @@ -14,9 +14,11 @@ .searchresult { display: inline !ie; } + .searchresults { margin: 1em 0 1em 0.4em; } + /* needs extra specificity to override `.mw-body p` selector */ .mw-body .mw-search-nonefound { margin: 0; @@ -35,49 +37,60 @@ .mw-search-visualclear { clear: both; } + .mw-search-results li { padding-bottom: 1.2em; list-style: none; list-style-image: none; } + .mw-search-results li a { font-size: 108%; } + .mw-search-result-data { color: #008000; font-size: 97%; } + .mw-search-profile-tabs { background-color: #f8f9fa; margin-top: 1em; border: 1px solid #c8ccd1; border-radius: 2px; } + .search-types { float: left; padding-left: 0.25em; } + .search-types ul { margin: 0; padding: 0; list-style: none; } + .search-types li { float: left; margin: 0; padding: 0; } + .search-types a { display: block; padding: 0.5em; } + .search-types .current a { color: #222; cursor: default; } + .search-types .current a:hover { text-decoration: none; } + .results-info { float: right; padding: 0.5em; @@ -85,13 +98,14 @@ color: #54595d; font-size: 95%; } + #mw-search-top-table div.oo-ui-actionFieldLayout { float: left; width: 100%; } /* Advanced options menu */ -/*==========================*/ +/* ===================== */ #mw-searchoptions { /* Support: Firefox, needs `clear: both` on `fieldset` when zoom level > 100%, see T176499 */ @@ -102,29 +116,35 @@ border: 1px solid #c8ccd1; border-radius: 0 0 2px 2px; } + #mw-searchoptions legend { display: none; } + #mw-searchoptions h4 { padding: 0; margin: 0; float: left; } + #mw-searchoptions table { float: left; margin-right: 3em; border-collapse: collapse; } + #mw-searchoptions table td { padding: 0 1em 0 0; white-space: nowrap; } + #mw-searchoptions .divider { clear: both; border-bottom: 1px solid #eaecf0; padding-top: 0.5em; margin-bottom: 0.5em; } + #mw-search-menu { padding-left: 6em; font-size: 85%; @@ -141,15 +161,18 @@ #mw-search-interwiki li { font-size: 95%; } + .mw-search-interwiki-more { float: right; font-size: 90%; } + #mw-search-interwiki-caption { text-align: center; font-weight: bold; font-size: 95%; } + .mw-search-interwiki-project { font-size: 97%; text-align: left; diff --git a/resources/src/mediawiki.special.search/search.css b/resources/src/mediawiki.special.search/search.css index aad784e222de..e55c785b7d8b 100644 --- a/resources/src/mediawiki.special.search/search.css +++ b/resources/src/mediawiki.special.search/search.css @@ -1,9 +1,11 @@ #mw-search-togglebox { float: right; } + #mw-search-togglebox label { margin-right: 0.25em; } + #mw-search-togglebox input { margin-left: 0.25em; } diff --git a/resources/src/mediawiki.special.userlogin.login.styles/login.css b/resources/src/mediawiki.special.userlogin.login.styles/login.css index fe013bc845a1..97a986e75254 100644 --- a/resources/src/mediawiki.special.userlogin.login.styles/login.css +++ b/resources/src/mediawiki.special.userlogin.login.styles/login.css @@ -13,16 +13,19 @@ background-color: #f8f9fa; color: #36c; } + #mw-createaccount-join:hover { background-color: #fff; border-color: #859ecc; box-shadow: none; } + #mw-createaccount-join:active { background-color: #eff3fa; color: #2a4b8d; border-color: #2a4b8d; } + #mw-createaccount-join:focus { border-color: #36c; box-shadow: inset 0 0 0 1px #36c; diff --git a/resources/src/mediawiki.special/special.css b/resources/src/mediawiki.special/special.css index 0404c455f923..35cdee7ed674 100644 --- a/resources/src/mediawiki.special/special.css +++ b/resources/src/mediawiki.special/special.css @@ -68,6 +68,7 @@ .mw-uctop { font-weight: bold; } + .mw-contributions-form select { vertical-align: middle; } @@ -92,6 +93,7 @@ .mw-listgrouprights-table tr { vertical-align: top; } + .listgrouprights-revoked { text-decoration: line-through; } @@ -130,6 +132,7 @@ white-space: nowrap; font-size: 90%; } + .mw-protectedpages-unknown { color: #72777d; font-size: 90%; diff --git a/resources/src/mediawiki.special/userrights.css b/resources/src/mediawiki.special/userrights.css index 1ffdf70ee554..14ad695a08c0 100644 --- a/resources/src/mediawiki.special/userrights.css +++ b/resources/src/mediawiki.special/userrights.css @@ -14,6 +14,7 @@ .mw-userrights-disabled { color: #72777d; } + .mw-userrights-groups * td, .mw-userrights-groups * th { padding-right: 1.5em; diff --git a/resources/src/mediawiki.ui/components/anchors.less b/resources/src/mediawiki.ui/components/anchors.less index 4de2451124c7..a9e4b7882dc8 100644 --- a/resources/src/mediawiki.ui/components/anchors.less +++ b/resources/src/mediawiki.ui/components/anchors.less @@ -67,6 +67,7 @@ Styleguide 6.2.1. &:hover { color: @mainColor; } + &:focus, &:active { color: darken( @mainColor, @colorDarkenPercentage ); diff --git a/resources/src/mediawiki.ui/components/forms.less b/resources/src/mediawiki.ui/components/forms.less index 18ac3188786d..09bf9cab24e9 100644 --- a/resources/src/mediawiki.ui/components/forms.less +++ b/resources/src/mediawiki.ui/components/forms.less @@ -36,7 +36,6 @@ // Styleguide 5.1. .mw-ui-vform { .box-sizing( border-box ); - width: @defaultFormWidth; // MW currently doesn't use the type attribute everywhere on inputs. @@ -139,7 +138,6 @@ display: block; margin-top: 5px; } - } // -------------------------------------------------------------------------- diff --git a/resources/src/mediawiki.ui/components/icons.less b/resources/src/mediawiki.ui/components/icons.less index 461de2f0fff6..1600493e56d5 100644 --- a/resources/src/mediawiki.ui/components/icons.less +++ b/resources/src/mediawiki.ui/components/icons.less @@ -47,7 +47,6 @@ @marginIcon: 2 * @iconGutterWidth; @width: @iconSize + @marginIcon; @sizeIconLarge: ( @iconSize * 1.75) + @marginIcon; - text-indent: -999px; overflow: hidden; width: @width; diff --git a/resources/src/mediawiki.ui/components/inputs.less b/resources/src/mediawiki.ui/components/inputs.less index 55d15b167f15..53c911bbe214 100644 --- a/resources/src/mediawiki.ui/components/inputs.less +++ b/resources/src/mediawiki.ui/components/inputs.less @@ -37,12 +37,10 @@ vertical-align: middle; // Normalize & style placeholder text, see T139034 - /* stylelint-disable indentation */ .mixin-placeholder( { color: @colorGray7; opacity: 1; } ); - /* stylelint-enable indentation */ // Firefox: Remove red outline when `required` attribute set and invalid content. // See https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid diff --git a/resources/src/mediawiki.ui/components/text.less b/resources/src/mediawiki.ui/components/text.less index e2264c674991..0bcded9cf1f0 100644 --- a/resources/src/mediawiki.ui/components/text.less +++ b/resources/src/mediawiki.ui/components/text.less @@ -29,6 +29,7 @@ Styleguide 6.1. &.mw-ui-progressive { color: @colorProgressive; } + &.mw-ui-destructive { color: @colorDestructive; } diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less index e7afff8a5b2f..5e4df479a367 100644 --- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less +++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less @@ -50,6 +50,7 @@ margin-left: 0; } } + .mw-widgets-datetime-calendarWidget-next { float: right; } diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less index 1035786d3182..253784e8f540 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less @@ -149,15 +149,18 @@ // 7x7 grid width: @calendarWidth / 7; line-height: @calendarHeight / 7; + // Don't overlap the hacked-up fake box-shadow border we get when focussed &:nth-child( 7n ) { width: @calendarWidth / 7 - 0.2em; margin-right: 0.2em; } + &:nth-child( 7n+1 ) { width: @calendarWidth / 7 - 0.2em; margin-left: 0.2em; } + &:nth-child( 42 ) ~ & { line-height: @calendarHeight / 7 - 0.2em; margin-bottom: 0.2em; @@ -168,15 +171,18 @@ // 2x6 grid width: @calendarWidth / 2; line-height: @calendarHeight / 6; + // Don't overlap the hacked-up fake box-shadow border we get when focussed &:nth-child( 2n ) { width: @calendarWidth / 2 - 0.2em; margin-right: 0.2em; } + &:nth-child( 2n+1 ) { width: @calendarWidth / 2 - 0.2em; margin-left: 0.2em; } + &:nth-child( 10 ) ~ & { line-height: @calendarHeight / 6 - 0.2em; margin-bottom: 0.2em; @@ -187,15 +193,18 @@ // 5x4 grid width: @calendarWidth / 5; line-height: @calendarHeight / 4; + // Don't overlap the hacked-up fake box-shadow border we get when focussed &:nth-child( 5n ) { width: @calendarWidth / 5 - 0.2em; margin-right: 0.2em; } + &:nth-child( 5n+1 ) { width: @calendarWidth / 5 - 0.2em; margin-left: 0.2em; } + &:nth-child( 15 ) ~ & { line-height: @calendarHeight / 4 - 0.2em; margin-bottom: 0.2em; diff --git a/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.less b/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.less index 8be1e869aaa0..b7f58a6035d2 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.less @@ -48,6 +48,7 @@ > .mw-widgets-stashedFileWidget-fileName { float: left; } + > .mw-widgets-stashedFileWidget-fileType { color: #72777d; float: right; diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less index 5540c64e196d..e52d0cdc3f7e 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less @@ -37,10 +37,12 @@ width: 3.75em; height: 3.75em; left: 0; + &:not( .mw-widget-titleOptionWidget-hasImage ) { background-color: #c8ccd1; opacity: 0.4; } + &.mw-widget-titleOptionWidget-hasImage { border: 0; background-size: cover; |