jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki theme: Unify `border-radius` values
......................................................................
MediaWiki theme: Unify `border-radius` values
Unifying `border-radius` values to `2px` across widgets.
Using `px` value due to IE supporting property from version 9 on and
therefore allows full page zoom with pixel values.
Bug: T123322
Change-Id: Id510956a9795b9ec2f41cc0e774ee45fe92d7a25
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/widgets.less
M src/themes/mediawiki/windows.less
5 files changed, 28 insertions(+), 27 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index bc5c8cc..adc5de7 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -43,7 +43,8 @@
@input-hover-border-bottom-width: 3px;
@input-focus-border-width: 2px;
@input-size: 1.6em;
-@border-radius: 2px;
+
+@border-radius-default: 2px;
@box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
@box-shadow-menu: @box-shadow-dialog;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index b058d10..ba0c563 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -108,7 +108,7 @@
padding: 0.5em 1em;
min-height: 1.2em;
min-width: 1em;
- border-radius: @border-radius;
+ border-radius: @border-radius-default;
position: relative;
&:hover,
diff --git a/src/themes/mediawiki/layouts.less
b/src/themes/mediawiki/layouts.less
index 679589b..3b22e1f 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -157,7 +157,7 @@
&-framed {
border: 1px solid #aaa;
- border-radius: 0.2em;
+ border-radius: @border-radius-default;
box-shadow: @box-shadow-dialog;
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 214826f..ab72cc9 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -26,7 +26,7 @@
.theme-oo-ui-buttonGroupWidget () {
display: inline-block;
white-space: nowrap;
- border-radius: @border-radius;
+ border-radius: @border-radius-default;
.oo-ui-inline-spacing(0.5em);
.oo-ui-buttonElement {
@@ -40,14 +40,14 @@
}
&:first-child .oo-ui-buttonElement-button {
- border-bottom-left-radius: @border-radius;
- border-top-left-radius: @border-radius;
+ border-bottom-left-radius: @border-radius-default;
+ border-top-left-radius: @border-radius-default;
margin-left: 0;
}
&:last-child .oo-ui-buttonElement-button {
- border-bottom-right-radius: @border-radius;
- border-top-right-radius: @border-radius;
+ border-bottom-right-radius: @border-radius-default;
+ border-top-right-radius: @border-radius-default;
}
}
}
@@ -109,7 +109,7 @@
height: 2.275em;
line-height: 1.275;
border: 1px solid #ccc;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
.oo-ui-indicatorElement-indicator {
right: 0;
@@ -188,7 +188,7 @@
height: 2.4em;
background-color: @background;
border: 1px solid #ccc;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
> .oo-ui-indicatorElement-indicator {
right: 0;
@@ -376,7 +376,7 @@
.oo-ui-box-sizing( border-box );
position: absolute;
left: 0;
- border-radius: @border-radius;
+ border-radius: @border-radius-default;
width: @input-size;
height: @input-size;
background-color: white;
@@ -434,7 +434,7 @@
font-family: inherit;
.oo-ui-box-sizing(border-box);
border: 1px solid #ccc;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
padding-left: 1em;
vertical-align: middle;
}
@@ -560,7 +560,7 @@
color: black;
border: 1px solid #ccc;
box-shadow: inset 0 0 0 0 @progressive;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
.oo-ui-transition( box-shadow @transition-ease-quick );
.oo-ui-box-sizing(border-box);
@@ -702,7 +702,7 @@
padding: 0.15em 0.25em;
border: 1px solid #ccc;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
.oo-ui-box-sizing(border-box);
@@ -791,7 +791,7 @@
background-color: #eee;
border: 1px solid #ccc;
color: @color-default;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
&.oo-ui-indicatorElement {
> .oo-ui-labelElement-label {
@@ -1010,8 +1010,8 @@
margin: 0.5em 0 0 0.75em;
border: 1px solid transparent;
border-bottom: none;
- border-top-left-radius: @border-radius;
- border-top-right-radius: @border-radius;
+ border-top-left-radius: @border-radius-default;
+ border-top-right-radius: @border-radius-default;
color: @color-default;
font-weight: bold;
@@ -1045,7 +1045,7 @@
&-popup {
background-color: @background;
border: 1px solid #aaa;
- border-radius: 0.2em;
+ border-radius: @border-radius-default;
box-shadow: @box-shadow-popup;
}
@@ -1128,7 +1128,7 @@
.theme-oo-ui-selectWidget () {}
.theme-oo-ui-buttonSelectWidget () {
- border-radius: @border-radius;
+ border-radius: @border-radius-default;
.oo-ui-inline-spacing(0.5em);
@@ -1139,14 +1139,14 @@
}
&:first-child .oo-ui-buttonElement-button {
- border-bottom-left-radius: @border-radius;
- border-top-left-radius: @border-radius;
+ border-bottom-left-radius: @border-radius-default;
+ border-top-left-radius: @border-radius-default;
margin-left: 0;
}
&:last-child .oo-ui-buttonElement-button {
- border-bottom-right-radius: @border-radius;
- border-top-right-radius: @border-radius;
+ border-bottom-right-radius: @border-radius-default;
+ border-top-right-radius: @border-radius-default;
}
}
}
@@ -1157,7 +1157,7 @@
background-color: @background;
margin-top: -1px;
border: 1px solid #aaa;
- border-radius: 0 0 0.2em 0.2em;
+ border-radius: 0 0 @border-radius-default @border-radius-default;
box-shadow: @box-shadow-menu;
}
@@ -1306,7 +1306,7 @@
max-width: 50em;
background-color: @background;
border: 1px solid #ccc;
- border-radius: 0.1em;
+ border-radius: @border-radius-default;
overflow: hidden;
&-bar {
diff --git a/src/themes/mediawiki/windows.less
b/src/themes/mediawiki/windows.less
index 7506c50..7b5a246 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -257,7 +257,7 @@
padding: 1em;
border: 1px solid #ff9e9e;
background-color: #fff7f7;
- border-radius: 0.25em;
+ border-radius: @border-radius-default;
}
}
@@ -292,7 +292,7 @@
&-modal&-floating > .oo-ui-dialog > .oo-ui-window-frame {
border: 1px solid #aaa;
- border-radius: 0.2em;
+ border-radius: @border-radius-default;
box-shadow: @box-shadow-dialog;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/263559
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id510956a9795b9ec2f41cc0e774ee45fe92d7a25
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: Violetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
