Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/192550
Change subject: Make toolbar dialog padding configurable ...................................................................... Make toolbar dialog padding configurable Change-Id: I65fc234a9046625a40cd8b9cab4072733730ded9 --- M src/themes/apex/dialogs.css M src/ui/dialogs/ve.ui.ToolbarDialog.js M src/ui/styles/dialogs/ve.ui.ToolbarDialog.css 3 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/50/192550/1 diff --git a/src/themes/apex/dialogs.css b/src/themes/apex/dialogs.css index 6b7895c..c68f4ac 100644 --- a/src/themes/apex/dialogs.css +++ b/src/themes/apex/dialogs.css @@ -4,4 +4,8 @@ * @copyright 2011-2015 VisualEditor Team and others; see http://ve.mit-license.org */ -/* Apex only styles go here */ \ No newline at end of file +/* ve.ui.ToolbarDialog */ + +.ve-ui-toolbarDialog .oo-ui-dialog-content > .oo-ui-window-body { + box-shadow: none; +} diff --git a/src/ui/dialogs/ve.ui.ToolbarDialog.js b/src/ui/dialogs/ve.ui.ToolbarDialog.js index f8a1b1e..cd96042 100644 --- a/src/ui/dialogs/ve.ui.ToolbarDialog.js +++ b/src/ui/dialogs/ve.ui.ToolbarDialog.js @@ -33,6 +33,8 @@ ve.ui.ToolbarDialog.static.size = 'full'; +ve.ui.ToolbarDialog.static.padded = true; + /* Methods */ /** @@ -43,4 +45,7 @@ ve.ui.ToolbarDialog.super.prototype.initialize.call( this ); this.$content.addClass( 've-ui-toolbarDialog-content' ); + if ( this.constructor.static.padded ) { + this.$element.addClass( 've-ui-toolbarDialog-padded' ); + } }; diff --git a/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css b/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css index f376ef3..55b0202 100644 --- a/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css +++ b/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css @@ -5,14 +5,19 @@ */ .ve-ui-toolbarDialog { - padding: 0.375em; /* 0.3em / 0.8 */ - padding-top: 0; overflow-y: hidden; max-height: 0; + border-top: 1px solid #ddd; -webkit-transition: max-height 250ms; -moz-transition: max-height 250ms; -o-transition: max-height 250ms; transition: max-height 250ms; +} + +.ve-ui-toolbarDialog-padded { + padding: 0.375em; /* 0.3em / 0.8 */ + padding-top: 0; + border-top: 0; } .ve-ui-toolbarDialog.oo-ui-window-ready { @@ -23,9 +28,4 @@ /* TODO: fix this upstream */ .ve-ui-toolbar .oo-ui-window-frame { position: relative; -} - -.ve-ui-toolbarDialog-content > .oo-ui-window-body { - bottom: auto; - box-shadow: none; } -- To view, visit https://gerrit.wikimedia.org/r/192550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65fc234a9046625a40cd8b9cab4072733730ded9 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
