jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (1c5e409ab1) ......................................................................
Update OOjs UI to v0.1.0-pre (1c5e409ab1) New changes: 83193e5 Make tools wrapper display inline so tools wrap around actions 1c5e409 Add backgrounds and borders to dropdowns in Minerva Change-Id: I93e35c207042fe5efdc3e01498405c9ec606c67a --- M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-minerva.css M lib/oojs-ui/oojs-ui-minerva.rtl.css M lib/oojs-ui/oojs-ui.js M lib/oojs-ui/oojs-ui.rtl.css M lib/oojs-ui/oojs-ui.svg.css M lib/oojs-ui/oojs-ui.svg.rtl.css 8 files changed, 46 insertions(+), 24 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index f35ce76..780e025 100644 --- a/lib/oojs-ui/oojs-ui-apex.css +++ b/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. @@ -769,7 +769,7 @@ float: right; } .oo-ui-toolbar-tools { - float: left; + display: inline; } .oo-ui-toolbar-tools, .oo-ui-toolbar-actions, diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 9639682..19f7fa5 100644 --- a/lib/oojs-ui/oojs-ui-apex.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. @@ -769,7 +769,7 @@ float: left; } .oo-ui-toolbar-tools { - float: right; + display: inline; } .oo-ui-toolbar-tools, .oo-ui-toolbar-actions, diff --git a/lib/oojs-ui/oojs-ui-minerva.css b/lib/oojs-ui/oojs-ui-minerva.css index 8058359..8fb7d86 100644 --- a/lib/oojs-ui/oojs-ui-minerva.css +++ b/lib/oojs-ui/oojs-ui-minerva.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. @@ -391,8 +391,10 @@ margin-right: 2.25em; } .oo-ui-popupToolGroup .oo-ui-toolGroup-tools { - top: 2em; + top: 2.3em; margin: 0 -1px; + border: solid 1px #dddddd; + background-color: white; } .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; @@ -460,7 +462,7 @@ float: right; } .oo-ui-toolbar-tools { - float: left; + display: inline; } .oo-ui-toolbar-tools, .oo-ui-toolbar-actions, @@ -485,6 +487,14 @@ width: 100%; pointer-events: none; } +.oo-ui-toolbar-bar { + border-bottom: solid 1px #dddddd; + background: white; +} +.oo-ui-toolbar-bar .oo-ui-toolbar-bar { + border: none; + background: none; +} .oo-ui-selectWidget { margin: 0; padding: 0; @@ -495,7 +505,6 @@ cursor: pointer; padding: 0.8em 1em 0.8em 3.35em; border: none; - border-bottom: 1px solid #dddddd; font-weight: bold; } .oo-ui-optionWidget.oo-ui-widget-disabled { @@ -794,6 +803,8 @@ } .oo-ui-menuWidget { position: absolute; + background: white; + border: solid 1px #dddddd; } .oo-ui-menuWidget input { position: absolute; diff --git a/lib/oojs-ui/oojs-ui-minerva.rtl.css b/lib/oojs-ui/oojs-ui-minerva.rtl.css index 26a8c45..5d08ae1 100644 --- a/lib/oojs-ui/oojs-ui-minerva.rtl.css +++ b/lib/oojs-ui/oojs-ui-minerva.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. @@ -391,8 +391,10 @@ margin-left: 2.25em; } .oo-ui-popupToolGroup .oo-ui-toolGroup-tools { - top: 2em; + top: 2.3em; margin: 0 -1px; + border: solid 1px #dddddd; + background-color: white; } .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; @@ -460,7 +462,7 @@ float: left; } .oo-ui-toolbar-tools { - float: right; + display: inline; } .oo-ui-toolbar-tools, .oo-ui-toolbar-actions, @@ -485,6 +487,14 @@ width: 100%; pointer-events: none; } +.oo-ui-toolbar-bar { + border-bottom: solid 1px #dddddd; + background: white; +} +.oo-ui-toolbar-bar .oo-ui-toolbar-bar { + border: none; + background: none; +} .oo-ui-selectWidget { margin: 0; padding: 0; @@ -495,7 +505,6 @@ cursor: pointer; padding: 0.8em 3.35em 0.8em 1em; border: none; - border-bottom: 1px solid #dddddd; font-weight: bold; } .oo-ui-optionWidget.oo-ui-widget-disabled { @@ -794,6 +803,8 @@ } .oo-ui-menuWidget { position: absolute; + background: white; + border: solid 1px #dddddd; } .oo-ui-menuWidget input { position: absolute; diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index 1e83653..eba2008 100644 --- a/lib/oojs-ui/oojs-ui.js +++ b/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ ( function ( OO ) { diff --git a/lib/oojs-ui/oojs-ui.rtl.css b/lib/oojs-ui/oojs-ui.rtl.css index 2d49e19..53bfaca 100644 --- a/lib/oojs-ui/oojs-ui.rtl.css +++ b/lib/oojs-ui/oojs-ui.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui.svg.css b/lib/oojs-ui/oojs-ui.svg.css index ebe91e0..fcd260e 100644 --- a/lib/oojs-ui/oojs-ui.svg.css +++ b/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui.svg.rtl.css b/lib/oojs-ui/oojs-ui.svg.rtl.css index c3290fa..0ddbd54 100644 --- a/lib/oojs-ui/oojs-ui.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (cc3c62607c) + * OOjs UI v0.1.0-pre (1c5e409ab1) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-08T18:25:29Z + * Date: 2014-09-09T01:20:15Z */ /* * Blank theme mixins. -- To view, visit https://gerrit.wikimedia.org/r/159239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93e35c207042fe5efdc3e01498405c9ec606c67a Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Esanders <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
