Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75079
Change subject: inline-block mixin added to button groups
......................................................................
inline-block mixin added to button groups
The inline-block mixin has been added to the button gorups so that
their placement behaviour is consistent with other UI elemnts such as buttons.
Change-Id: Ib1a45f57e3cdad9893546ffb53c8203fc8ddc1ee
---
M resources/mediawiki.ui/mediawiki.ui.default.css
M resources/mediawiki.ui/mediawiki.ui.vector.css
M resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
3 files changed, 40 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/75079/1
diff --git a/resources/mediawiki.ui/mediawiki.ui.default.css
b/resources/mediawiki.ui/mediawiki.ui.default.css
index 89ca25a..726c91b 100644
--- a/resources/mediawiki.ui/mediawiki.ui.default.css
+++ b/resources/mediawiki.ui/mediawiki.ui.default.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/**
* Provide Agora appearance for mw-ui-* classes when using a skin other than
* Vector.
@@ -106,6 +107,16 @@
}
/* line 56, sourcefiles/scss/components/default/_buttons.scss */
+.mw-ui-button-group {
+ display: -moz-inline-stack;
+ display: inline-block;
+ vertical-align: middle;
+ *vertical-align: auto;
+ zoom: 1;
+ *display: inline;
+}
+
+/* line 60, sourcefiles/scss/components/default/_buttons.scss */
.mw-ui-button-group > * {
-webkit-border-radius: 0;
-moz-border-radius: 0;
@@ -114,7 +125,7 @@
border-radius: 0;
float: left;
}
-/* line 60, sourcefiles/scss/components/default/_buttons.scss */
+/* line 64, sourcefiles/scss/components/default/_buttons.scss */
.mw-ui-button-group > *:first-child {
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
@@ -123,7 +134,7 @@
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
}
-/* line 65, sourcefiles/scss/components/default/_buttons.scss */
+/* line 69, sourcefiles/scss/components/default/_buttons.scss */
.mw-ui-button-group > *:last-child {
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
@@ -171,7 +182,7 @@
box-shadow: #4091ed 0px 0px 5px;
border-color: #4091ed;
}
-/* line 38, sourcefiles/scss/components/default/_forms.scss */
+/* line 40, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-vform > div label {
display: block;
-webkit-box-sizing: border-box;
@@ -187,7 +198,7 @@
.mw-ui-vform > div label * {
font-weight: normal;
}
-/* line 49, sourcefiles/scss/components/default/_forms.scss */
+/* line 51, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-vform > div input[type="checkbox"],
.mw-ui-vform > div input[type="radio"] {
display: inline;
@@ -197,7 +208,7 @@
width: auto;
}
-/* line 65, sourcefiles/scss/components/default/_forms.scss */
+/* line 67, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-input {
outline: 0;
border-style: solid;
@@ -212,7 +223,7 @@
border-color: #4091ed;
}
-/* line 72, sourcefiles/scss/components/default/_forms.scss */
+/* line 74, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-label {
font-size: 0.9em;
color: #4a4a4a;
@@ -222,7 +233,7 @@
font-weight: normal;
}
-/* line 81, sourcefiles/scss/components/default/_forms.scss */
+/* line 83, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-checkbox-label, .mw-ui-radio-label {
margin-bottom: 0.5em;
cursor: pointer;
diff --git a/resources/mediawiki.ui/mediawiki.ui.vector.css
b/resources/mediawiki.ui/mediawiki.ui.vector.css
index 94e3300..c1918e4 100644
--- a/resources/mediawiki.ui/mediawiki.ui.vector.css
+++ b/resources/mediawiki.ui/mediawiki.ui.vector.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/**
* Provide Agora appearance for mw-ui-* classes when using the Vector skin.
* Compass builds these Agora styles from source Sass files in
@@ -105,6 +106,16 @@
}
/* line 56, sourcefiles/scss/components/default/_buttons.scss */
+.mw-ui-button-group {
+ display: -moz-inline-stack;
+ display: inline-block;
+ vertical-align: middle;
+ *vertical-align: auto;
+ zoom: 1;
+ *display: inline;
+}
+
+/* line 60, sourcefiles/scss/components/default/_buttons.scss */
.mw-ui-button-group > * {
-webkit-border-radius: 0;
-moz-border-radius: 0;
@@ -113,7 +124,7 @@
border-radius: 0;
float: left;
}
-/* line 60, sourcefiles/scss/components/default/_buttons.scss */
+/* line 64, sourcefiles/scss/components/default/_buttons.scss */
.mw-ui-button-group > *:first-child {
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
@@ -122,7 +133,7 @@
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
}
-/* line 65, sourcefiles/scss/components/default/_buttons.scss */
+/* line 69, sourcefiles/scss/components/default/_buttons.scss */
.mw-ui-button-group > *:last-child {
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
@@ -300,7 +311,7 @@
box-shadow: #4091ed 0px 0px 5px;
border-color: #4091ed;
}
-/* line 38, sourcefiles/scss/components/default/_forms.scss */
+/* line 40, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-vform > div label {
display: block;
-webkit-box-sizing: border-box;
@@ -316,7 +327,7 @@
.mw-ui-vform > div label * {
font-weight: normal;
}
-/* line 49, sourcefiles/scss/components/default/_forms.scss */
+/* line 51, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-vform > div input[type="checkbox"],
.mw-ui-vform > div input[type="radio"] {
display: inline;
@@ -326,7 +337,7 @@
width: auto;
}
-/* line 65, sourcefiles/scss/components/default/_forms.scss */
+/* line 67, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-input {
outline: 0;
border-style: solid;
@@ -341,7 +352,7 @@
border-color: #4091ed;
}
-/* line 72, sourcefiles/scss/components/default/_forms.scss */
+/* line 74, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-label {
font-size: 0.9em;
color: #4a4a4a;
@@ -351,7 +362,7 @@
font-weight: normal;
}
-/* line 81, sourcefiles/scss/components/default/_forms.scss */
+/* line 83, sourcefiles/scss/components/default/_forms.scss */
.mw-ui-checkbox-label, .mw-ui-radio-label {
margin-bottom: 0.5em;
cursor: pointer;
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
b/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
index d67810f..251df34 100644
--- a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
+++ b/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
@@ -53,6 +53,10 @@
}
// Button groups
+.mw-ui-button-group {
+ @include inline-block;
+}
+
.mw-ui-button-group > * {
@include border-radius(0);
float: left;
--
To view, visit https://gerrit.wikimedia.org/r/75079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1a45f57e3cdad9893546ffb53c8203fc8ddc1ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Pginer <pgi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
