jenkins-bot has submitted this change and it was merged.
Change subject: Clean-up duplicate properties across widgets
......................................................................
Clean-up duplicate properties across widgets
Removing superflous property duplicates across widgets, predominantely
ButtonElement widget.
Change-Id: I074a1dfb090f314da7586c91468cb6389e0ea456
---
M src/styles/elements/ButtonElement.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 3 insertions(+), 19 deletions(-)
Approvals:
Prtksxna: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/styles/elements/ButtonElement.less
b/src/styles/elements/ButtonElement.less
index 61fae00..bafc289 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -20,31 +20,21 @@
}
&.oo-ui-indicatorElement > .oo-ui-buttonElement-button >
.oo-ui-indicatorElement-indicator,
- &.oo-ui-iconElement > .oo-ui-buttonElement-button >
.oo-ui-iconElement-icon {
- display: inline-block;
+ &.oo-ui-iconElement > .oo-ui-buttonElement-button >
.oo-ui-iconElement-icon,
+ &.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
+ display: inline-block; // For vertical alignment
vertical-align: middle;
}
&-frameless {
display: inline-block;
position: relative;
-
- &.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- display: inline-block;
- vertical-align: middle;
- }
}
&-framed {
> .oo-ui-buttonElement-button {
- display: inline-block;
vertical-align: top;
text-align: center;
- }
-
- &.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- display: inline-block;
- vertical-align: middle;
}
&.oo-ui-widget-disabled {
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index 41e7565..d697e77 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -129,7 +129,6 @@
> input.oo-ui-buttonElement-button,
&.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
line-height: 1.2em;
- display: inline-block; // For vertical alignment
}
&.oo-ui-iconElement {
@@ -146,10 +145,6 @@
}
&.oo-ui-indicatorElement {
- > .oo-ui-buttonElement-button >
.oo-ui-indicatorElement-indicator {
- display: inline-block; // For vertical alignment
- }
-
&.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-indicatorElement-indicator,
&.oo-ui-iconElement:not( .oo-ui-labelElement ) >
.oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator {
margin-left: @size-indicator / 2;
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index ca08efe..7d87e52 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -120,7 +120,6 @@
}
.oo-ui-labelElement-label {
- line-height: 1.275em;
margin: 0 1em;
}
--
To view, visit https://gerrit.wikimedia.org/r/272640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I074a1dfb090f314da7586c91468cb6389e0ea456
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
