jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341117 )
Change subject: MediaWiki theme: Align “framed” ButtonWidgets cross-browser
......................................................................
MediaWiki theme: Align “framed” ButtonWidgets cross-browser
This might finally be the cross-browser salvation to cross-browser
button appearance. Aligning framed ButtonWidgets (labelled or icon-only)
to each other. Also fixing vertical positioning of labels in Firefox.
Bug: T113495
Bug: T122503
Bug: T159580
Change-Id: I9a2d3975927ee6dc7514cbba24b208a8217012de
---
M src/styles/elements/ButtonElement.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
4 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/styles/elements/ButtonElement.less
b/src/styles/elements/ButtonElement.less
index 11a6d52..db2e2ea 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -2,6 +2,7 @@
.oo-ui-buttonElement {
display: inline-block;
+ line-height: normal; // Override MediaWiki skin's `line-height`
vertical-align: middle;
> .oo-ui-buttonElement-button {
@@ -11,7 +12,6 @@
vertical-align: middle;
font-family: inherit;
font-size: inherit;
- line-height: normal; // Override MediaWiki skin's `line-height`
white-space: nowrap;
.oo-ui-unselectable();
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 6732f3c..4bfbd16 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -106,7 +106,7 @@
@border-width-medium: 2px;
@padding-widget-default: 7 / @oo-ui-font-size-browser /
@oo-ui-font-size-default; // equals `0.547em`≈`7px` at base `font-size: 12.8px`
-@padding-top-input-text: 8 / @oo-ui-font-size-browser /
@oo-ui-font-size-default; // equals `0.625em`≈`8px` at base `font-size: 12.8px`
+@padding-input-top: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
// equals `0.625em`≈`8px` at base `font-size: 12.8px`
@box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
@box-shadow-menu: @box-shadow-dialog;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index 032afeb..92db35d 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -164,7 +164,7 @@
position: relative;
min-height: @min-height-button-default;
border-radius: @border-radius-default;
- padding: @padding-widget-default 1em;
+ padding: @padding-input-top 1em @padding-widget-default;
}
&.oo-ui-iconElement > .oo-ui-buttonElement-button {
@@ -178,10 +178,16 @@
min-width: 0;
}
+ // Support Safari, reset `line-height` to bare minimum in order
to normalize
+ // it in the next rule across browsers.
// Support `<input>` from ButtonInputWidget
> input.oo-ui-buttonElement-button,
+ &.oo-ui-labelElement > .oo-ui-buttonElement-button {
+ line-height: 1;
+ }
+
&.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- line-height: 1.25; // same as `min-height` in `-button`
above
+ line-height: 1.172; // equals `15px`
}
&.oo-ui-iconElement {
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 8872c16..b897664 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -779,7 +779,7 @@
color: @color-emphasized;
border: @border-default;
border-radius: @border-radius-default;
- padding: @padding-top-input-text @padding-widget-default
@padding-widget-default;
+ padding: @padding-input-top @padding-widget-default
@padding-widget-default;
}
input {
@@ -902,7 +902,7 @@
> .oo-ui-labelElement-label {
color: @color-subtle;
margin-top: 1px; // making up for `border` on `input`
- padding: @padding-top-input-text @padding-widget-default
@padding-widget-default; // same as `input` above
+ padding: @padding-input-top @padding-widget-default
@padding-widget-default; // same as `input` above
line-height: 1.172em;
}
--
To view, visit https://gerrit.wikimedia.org/r/341117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a2d3975927ee6dc7514cbba24b208a8217012de
Gerrit-PatchSet: 3
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: TheDJ <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
