jenkins-bot has submitted this change and it was merged.
Change subject: Toolbar: Move some tweaks from demo to actual implementation
......................................................................
Toolbar: Move some tweaks from demo to actual implementation
Also, simplify demo a bit.
Change-Id: I92f9ee4af29d6a51c484d9553031d881a29d831b
---
M demos/pages/toolbars.js
M demos/styles/demo.css
M src/styles/Toolbar.less
M src/themes/apex/tools.less
M src/themes/mediawiki/tools.less
5 files changed, 27 insertions(+), 26 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js
index c1b291c..fad3a75 100644
--- a/demos/pages/toolbars.js
+++ b/demos/pages/toolbars.js
@@ -220,18 +220,10 @@
actionButton = new OO.ui.ButtonWidget( { label: 'Action' } );
actionButtonDisabled = new OO.ui.ButtonWidget( { label: 'Disabled',
disabled: true } );
toolbars[ 1 ].$actions
- .addClass( 'oo-ui-demo-toolbar-actionButtons' )
.append( actionButton.$element, actionButtonDisabled.$element );
toolbars[ 3 ].$actions
- .append(
- $( '<div>' )
- .addClass( 'oo-ui-demo-toolbar-utilities' )
- .append( toolbars[ 2 ].$element ),
- $( '<div>' )
- .addClass( 'oo-ui-demo-toolbar-actionButtons' )
- .append( saveButton.$element )
- );
+ .append( toolbars[ 2 ].$element, saveButton.$element );
for ( i = 0; i < toolbars.length; i++ ) {
toolbars[ i ].emit( 'updateState' );
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index 087d22b..1c8d613 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -56,23 +56,6 @@
min-height: 100px;
}
-.oo-ui-demo-toolbar-utilities {
- display: inline-block;
- vertical-align: middle;
-}
-
-.oo-ui-demo-toolbar-actionButtons {
- float: right;
- vertical-align: top;
- padding: 0.25em;
-}
-
-.oo-ui-demo-toolbar-actionButtons > .oo-ui-buttonElement-framed {
- margin-left: 0.25em;
- margin-right: 0.25em;
- margin-top: 0.2em;
-}
-
/* Icons demo */
.oo-ui-demo-icons .oo-ui-buttonSelectWidget {
diff --git a/src/styles/Toolbar.less b/src/styles/Toolbar.less
index 2bc054f..b3564f3 100644
--- a/src/styles/Toolbar.less
+++ b/src/styles/Toolbar.less
@@ -9,6 +9,10 @@
&-actions {
float: right;
+
+ .oo-ui-toolbar {
+ display: inline-block;
+ }
}
&-tools {
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index 021aac3..7270c70 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -11,6 +11,17 @@
}
}
+ &-actions {
+ > .oo-ui-buttonElement {
+ margin-top: 0.4em;
+ margin-bottom: 0.4em;
+ }
+
+ > .oo-ui-buttonElement:last-child {
+ margin-right: 0.5em;
+ }
+ }
+
&-shadow {
.oo-ui-background-image('@{oo-ui-default-image-path}/toolbar-shadow.png');
bottom: -9px;
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index e76e0ce..7d3fb70 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -11,6 +11,17 @@
}
}
+ &-actions {
+ > .oo-ui-buttonElement {
+ margin-top: 0.4em;
+ margin-bottom: 0.4em;
+ }
+
+ > .oo-ui-buttonElement:last-child {
+ margin-right: 0.5em;
+ }
+ }
+
&-shadow {
display: none;
}
--
To view, visit https://gerrit.wikimedia.org/r/209752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92f9ee4af29d6a51c484d9553031d881a29d831b
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
