VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348257 )
Change subject: themes: Align `@size-*-min` variable to naming scheme and rename
......................................................................
themes: Align `@size-*-min` variable to naming scheme and rename
Aligning `@size-*-min` variable to naming scheme by renaming it to
`@min-size-*`.
Change-Id: Ib30efca433b6ca73bdbf5d9f04ff964322d7d83d
---
M src/styles/elements/IconElement.less
M src/styles/elements/IndicatorElement.less
M src/themes/apex/common.less
M src/themes/blank/common.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
6 files changed, 17 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/57/348257/1
diff --git a/src/styles/elements/IconElement.less
b/src/styles/elements/IconElement.less
index 4a76b4f..120454b 100644
--- a/src/styles/elements/IconElement.less
+++ b/src/styles/elements/IconElement.less
@@ -7,10 +7,10 @@
background-position: center center;
background-repeat: no-repeat;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
- min-width: @size-icon-min;
+ min-width: @min-size-icon;
width: @size-icon;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
- min-height: @size-icon-min;
+ min-height: @min-size-icon;
height: @size-icon;
}
diff --git a/src/styles/elements/IndicatorElement.less
b/src/styles/elements/IndicatorElement.less
index 5584dbd..b4a6a6d 100644
--- a/src/styles/elements/IndicatorElement.less
+++ b/src/styles/elements/IndicatorElement.less
@@ -7,10 +7,10 @@
background-position: center center;
background-repeat: no-repeat;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
- min-width: @size-indicator-min;
+ min-width: @min-size-indicator;
width: @size-indicator;
// Support: IE11, Edge 12+ (T94494), Firefox 31.5 (T93636)
- min-height: @size-indicator-min;
+ min-height: @min-size-indicator;
height: @size-indicator;
}
diff --git a/src/themes/apex/common.less b/src/themes/apex/common.less
index 819b106..622e4c9 100644
--- a/src/themes/apex/common.less
+++ b/src/themes/apex/common.less
@@ -24,12 +24,13 @@
@color-subtle: #767676;
// Box Sizes
+// `@*size` variables are used for `*width` & `*height` properties
+@min-size-icon: 24px;
+@min-size-indicator: 12px;
@max-width-default: 50em;
@max-width-input-default: @max-width-default;
@size-anchor: 6px;
-@size-icon-min: 24px;
-@size-indicator-min: 12px;
@size-icon: unit( 24 / 16 / 0.8, em );
@size-indicator: unit( 12 / 16 / 0.8, em );
diff --git a/src/themes/blank/common.less b/src/themes/blank/common.less
index 6ec8a32..e76d596 100644
--- a/src/themes/blank/common.less
+++ b/src/themes/blank/common.less
@@ -5,8 +5,9 @@
@oo-ui-font-size-browser: 16; // assumed browser default of `16px`
@oo-ui-font-size-default: 0.8em; // equals `12.8px` at browser default of
`16px`
-@size-icon-min: 24px; // values used for `min-height` are defined in `px`, see
T130691
-@size-indicator-min: 12px;
+// `@*size` variables are used for `*width` & `*height` properties
+@min-size-icon: 24px; // values used for `min-height` are defined in `px`, see
T130691
+@min-size-indicator: 12px;
@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; //
equals `1.875em`≈`24px` at base `font-size: 12.8px`
@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; //
equals `0.9375em`≈`12px` at base `font-size: 12.8px`
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 471b0b5..851c14a 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -61,19 +61,20 @@
@border-toolbar: @border-width-default solid #c8ccd1;
// Box Sizes
+// `@*size` variables are used for `*width` & `*height` properties
+@size-default: 32 / @oo-ui-font-size-browser / @oo-ui-font-size-default; //
equals `2.5em`≈`32px`
+
+@min-size-icon: 24px; // values used for `min-height` are defined in `px`, see
T130691
+@min-size-indicator: 12px;
@min-width-button-default: 40 / @oo-ui-font-size-browser /
@oo-ui-font-size-default; // equals `3.125em`≈`40px` at base `font-size: 12.8px`
-@min-width-button-combo-widget: 32 / @oo-ui-font-size-browser /
@oo-ui-font-size-default; // equals `2.5em`≈`32px`
+@min-width-button-combo-widget: @size-default;
@min-height-widget-default: @size-default;
@min-height-toggleswitch: 26px; // equals `16px` @size-toggleswitch-grip-min +
4px*2 distance top/bottom + 1px*2 border top/bottom
@max-width-default: 50em;
@max-width-input: @max-width-default;
-// `@size-*` variables are used for `width` & `height` properties
-@size-default: 32 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
@size-anchor: 9px;
@size-button-default: @size-default;
-@size-icon-min: 24px; // values used for `min-height` are defined in `px`, see
T130691
-@size-indicator-min: 12px;
@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; //
equals `1.875em`≈`24px`
@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; //
equals `0.9375em`≈`12px`
@size-toggleswitch-grip-min: 16px;
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index b8194c4..5bf3b3d 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1349,7 +1349,7 @@
&-clearButton {
top: -1px; // Address `border-width`
right: @padding-start-input-text-icon; // With close, no
indicator
- min-width: @size-icon-min;
+ min-width: @min-size-icon;
width: @size-icon;
margin-right: 0;
--
To view, visit https://gerrit.wikimedia.org/r/348257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib30efca433b6ca73bdbf5d9f04ff964322d7d83d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <volke...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
