Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Date- & DateTimeInputWidget: Replace ems with px where applicable"

Browse source
This commit is contained in:
jenkins-bot 2019-10-21 14:27:40 +00:00 committed by Gerrit Code Review
commit 6e385eb875
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less
View file

@ -74,12 +74,12 @@
.oo-ui-box-sizing( border-box );
border: 0;
border-radius: @border-radius-base;
padding-top: @padding-top-base;
padding-bottom: @padding-bottom-base;
padding-top: @padding-vertical-base;
padding-bottom: @padding-vertical-base;
box-shadow: none;
font-size: inherit;
font-family: inherit;
line-height: @line-height-widget-singleline;
line-height: @line-height-widget-base;
text-align: center;
vertical-align: top;

16
resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less
View file

@ -34,6 +34,7 @@
// Variables taken from OOUI's WikimediaUI theme, see its common.less for further explanations
@ooui-font-size-browser: 16; // assumed browser default of `16px`
@ooui-font-size-base: 0.875em; // equals `14px` at browser default of `16px`
@ooui-unit: em;
@background-color-base: #fff;
@background-color-base--hover: #eaecf0;
@ -53,12 +54,12 @@
@max-width-base: 50em;
@max-width-input: @max-width-base;
@padding-input-text: @padding-top-base @padding-horizontal-input-text @padding-bottom-base;
@padding-horizontal-base: 12 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-horizontal-input-text: 8 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-top-base: 8 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-top-button-clear: 28 / @ooui-font-size-browser / @ooui-font-size-base; // As it's inside an input, we need to reduce from borders surrounding
@padding-bottom-base: 7 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-input-text: @padding-vertical-base @padding-horizontal-input-text;
@padding-horizontal-base: 12px;
@padding-horizontal-input-text: 8px;
@padding-vertical-base: 6px;
// All paddings holding icons need `em`s due to font-size derived icon scaling.
@padding-top-button-clear: 28 / @ooui-font-size-browser / @ooui-font-size-base; // As it's inside an input, we need to reduce from borders surrounding.
@padding-start-input-text-icon: 6 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-start-input-text-icon-label: 32 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-start-button-clear: 4 / @ooui-font-size-browser / @ooui-font-size-base;
@ -76,7 +77,8 @@
@box-shadow-widget: inset 0 0 0 1px transparent;
@box-shadow-erroneous--focus: inset 0 0 0 1px @color-erroneous;
@line-height-widget-singleline: 15 / @ooui-font-size-browser / @ooui-font-size-base;
// `line-height` has to be relative/in `em` to enable user override in browser settings.
@line-height-widget-base: unit( 18 / @ooui-font-size-browser / @ooui-font-size-base, @ooui-unit ); // equals `18px` at base `font-size: 14px;
@text-shadow-base: 0 1px 1px @color-base--inverted; // 'coined' effect
@text-shadow-base--disabled: @text-shadow-base;

15
resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
View file

@ -8,6 +8,7 @@
// Variables taken from OOUI's WikimediaUI theme
@ooui-font-size-browser: 16; // assumed browser default of `16px`
@ooui-font-size-base: 0.875em; // equals `14px` at browser default of `16px`
@ooui-unit: em;
@background-color-base: #fff;
@ -18,15 +19,15 @@
@border-color-input--hover: #72777d;
@border-radius-base: 2px;
@padding-input-text: @padding-top-base @padding-horizontal-input-text @padding-bottom-base;
@padding-horizontal-input-text: 8 / @ooui-font-size-browser / @ooui-font-size-base; // equals `0.57142857em`≈`7px`
@padding-top-base: 8 / @ooui-font-size-browser / @ooui-font-size-base;
@padding-bottom-base: 7 / @ooui-font-size-browser / @ooui-font-size-base; // equals `0.5em`≈`7px`
@padding-input-text: @padding-vertical-base @padding-horizontal-input-text;
@padding-horizontal-input-text: 8px;
@padding-vertical-base: 6px;
@box-shadow-widget: inset 0 0 0 1px transparent;
@box-shadow-widget--focus: inset 0 0 0 1px #36c;
@line-height-widget-singleline: 15 / @ooui-font-size-browser / @ooui-font-size-base; // equals `1.07142857em`≈`15px`; Firefox needs a value, Chrome the unit;
// `line-height` has to be relative/in `em` to enable user override in browser settings.
@line-height-widget-base: unit( 18 / @ooui-font-size-browser / @ooui-font-size-base, @ooui-unit ); // equals `18px` at base `font-size: 14px;
@transition-ease-medium: @transition-duration-medium; // `ease` is the initial value
@transition-duration-medium: 250ms;
@ -61,7 +62,7 @@
// .oo-ui-inline-spacing( 0.5em ); already inherited from `.oo-ui-inputWidget`
.oo-ui-labelElement-label {
line-height: @line-height-widget-singleline;
line-height: @line-height-widget-base;
}
}
@ -87,7 +88,7 @@
border: @border-base;
border-radius: @border-radius-base;
padding: @padding-input-text;
line-height: @line-height-widget-singleline;
line-height: @line-height-widget-base;
}
&.oo-ui-widget-enabled {