[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Streamlining icon/indicator visibility
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/383493 ) Change subject: WikimediaUI theme: Streamlining icon/indicator visibility .. WikimediaUI theme: Streamlining icon/indicator visibility This is, due to the internal architecture, a specificity hassle. It seems like the most appropriate way to hide all the non-used icons/indicator element. Bug: T160593 Change-Id: I5b3ac8da1dd692ed62878cc1ffcc0c1066a254e0 --- M src/styles/elements/IconElement.less M src/styles/elements/IndicatorElement.less M src/themes/wikimediaui/layouts.less M src/themes/wikimediaui/tools.less M src/themes/wikimediaui/widgets.less 5 files changed, 18 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/styles/elements/IconElement.less b/src/styles/elements/IconElement.less index a7bdc13..a78597e 100644 --- a/src/styles/elements/IconElement.less +++ b/src/styles/elements/IconElement.less @@ -6,7 +6,6 @@ background-size: contain; background-position: center center; background-repeat: no-repeat; - display: none; position: absolute; top: 0; // Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636) diff --git a/src/styles/elements/IndicatorElement.less b/src/styles/elements/IndicatorElement.less index 9819345..0eabf72 100644 --- a/src/styles/elements/IndicatorElement.less +++ b/src/styles/elements/IndicatorElement.less @@ -6,7 +6,6 @@ background-size: contain; background-position: center center; background-repeat: no-repeat; - display: none; position: absolute; top: 0; // Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636) diff --git a/src/themes/wikimediaui/layouts.less b/src/themes/wikimediaui/layouts.less index 8e3c18a..8a4f8a2 100644 --- a/src/themes/wikimediaui/layouts.less +++ b/src/themes/wikimediaui/layouts.less @@ -1,10 +1,6 @@ @import 'common'; -.theme-oo-ui-layout () { - &.oo-ui-iconElement .oo-ui-iconElement-icon { - display: block; - } -} +.theme-oo-ui-layout () {} .theme-oo-ui-bookletLayout () { &-stackLayout { @@ -185,6 +181,10 @@ } } + &.oo-ui-iconElement > .oo-ui-fieldsetLayout-header .oo-ui-iconElement-icon { + display: block; + } + + .oo-ui-fieldsetLayout, + .oo-ui-formLayout { margin-top: 2em; diff --git a/src/themes/wikimediaui/tools.less b/src/themes/wikimediaui/tools.less index ab59092..f8c8263 100644 --- a/src/themes/wikimediaui/tools.less +++ b/src/themes/wikimediaui/tools.less @@ -92,6 +92,7 @@ } &.oo-ui-iconElement .oo-ui-iconElement-icon { + display: block; left: @start-tool-icon-indicator; } diff --git a/src/themes/wikimediaui/widgets.less b/src/themes/wikimediaui/widgets.less index b3e1fbd..3b82e9a 100644 --- a/src/themes/wikimediaui/widgets.less +++ b/src/themes/wikimediaui/widgets.less @@ -1,8 +1,19 @@ @import 'common'; .theme-oo-ui-widget () { + .oo-ui-iconElement-icon, + .oo-ui-indicatorElement-indicator, + &.oo-ui-iconElement .oo-ui-widget .oo-ui-iconElement-icon, + &.oo-ui-indicatorElement .oo-ui-widget .oo-ui-indicatorElement-indicator { + display: none; + } + &.oo-ui-iconElement .oo-ui-iconElement-icon, - &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { + &.oo-ui-iconElement > * > .oo-ui-iconElement-icon, + &.oo-ui-iconElement .oo-ui-iconElement .oo-ui-iconElement-icon, + &.oo-ui-indicatorElement > .oo-ui-indicatorElement-indicator, + &.oo-ui-indicatorElement > * > .oo-ui-indicatorElement-indicator, + &.oo-ui-indicatorElement .oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { display: block; } } -- To view, visit https://gerrit.wikimedia.org/r/383493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b3ac8da1dd692ed62878cc1ffcc0c1066a254e0 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Streamlining icon/indicator visibility
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383493 ) Change subject: WikimediaUI theme: Streamlining icon/indicator visibility .. WikimediaUI theme: Streamlining icon/indicator visibility This is, due to the internal architecture, a specificity hassle. It seems like the most appropriate way to hide all the non-used icons/indicator element. Bug: T160593 Change-Id: I5b3ac8da1dd692ed62878cc1ffcc0c1066a254e0 --- M src/styles/elements/IconElement.less M src/styles/elements/IndicatorElement.less M src/themes/wikimediaui/layouts.less M src/themes/wikimediaui/tools.less M src/themes/wikimediaui/widgets.less 5 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/93/383493/1 diff --git a/src/styles/elements/IconElement.less b/src/styles/elements/IconElement.less index a7bdc13..a78597e 100644 --- a/src/styles/elements/IconElement.less +++ b/src/styles/elements/IconElement.less @@ -6,7 +6,6 @@ background-size: contain; background-position: center center; background-repeat: no-repeat; - display: none; position: absolute; top: 0; // Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636) diff --git a/src/styles/elements/IndicatorElement.less b/src/styles/elements/IndicatorElement.less index 9819345..0eabf72 100644 --- a/src/styles/elements/IndicatorElement.less +++ b/src/styles/elements/IndicatorElement.less @@ -6,7 +6,6 @@ background-size: contain; background-position: center center; background-repeat: no-repeat; - display: none; position: absolute; top: 0; // Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636) diff --git a/src/themes/wikimediaui/layouts.less b/src/themes/wikimediaui/layouts.less index 8e3c18a..8a4f8a2 100644 --- a/src/themes/wikimediaui/layouts.less +++ b/src/themes/wikimediaui/layouts.less @@ -1,10 +1,6 @@ @import 'common'; -.theme-oo-ui-layout () { - &.oo-ui-iconElement .oo-ui-iconElement-icon { - display: block; - } -} +.theme-oo-ui-layout () {} .theme-oo-ui-bookletLayout () { &-stackLayout { @@ -185,6 +181,10 @@ } } + &.oo-ui-iconElement > .oo-ui-fieldsetLayout-header .oo-ui-iconElement-icon { + display: block; + } + + .oo-ui-fieldsetLayout, + .oo-ui-formLayout { margin-top: 2em; diff --git a/src/themes/wikimediaui/tools.less b/src/themes/wikimediaui/tools.less index ab59092..f8c8263 100644 --- a/src/themes/wikimediaui/tools.less +++ b/src/themes/wikimediaui/tools.less @@ -92,6 +92,7 @@ } &.oo-ui-iconElement .oo-ui-iconElement-icon { + display: block; left: @start-tool-icon-indicator; } diff --git a/src/themes/wikimediaui/widgets.less b/src/themes/wikimediaui/widgets.less index b3e1fbd..3b82e9a 100644 --- a/src/themes/wikimediaui/widgets.less +++ b/src/themes/wikimediaui/widgets.less @@ -1,8 +1,19 @@ @import 'common'; .theme-oo-ui-widget () { + .oo-ui-iconElement-icon, + .oo-ui-indicatorElement-indicator, + &.oo-ui-iconElement .oo-ui-widget .oo-ui-iconElement-icon, + &.oo-ui-indicatorElement .oo-ui-widget .oo-ui-indicatorElement-indicator { + display: none; + } + &.oo-ui-iconElement .oo-ui-iconElement-icon, - &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { + &.oo-ui-iconElement > * > .oo-ui-iconElement-icon, + &.oo-ui-iconElement .oo-ui-iconElement .oo-ui-iconElement-icon, + &.oo-ui-indicatorElement > .oo-ui-indicatorElement-indicator, + &.oo-ui-indicatorElement > * > .oo-ui-indicatorElement-indicator, + &.oo-ui-indicatorElement .oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { display: block; } } -- To view, visit https://gerrit.wikimedia.org/r/383493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b3ac8da1dd692ed62878cc1ffcc0c1066a254e0 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits