From b43909be0e753fe2d24d90bd7397ffcd10ab7174 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 20 Nov 2014 10:41:40 -0800 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (20c61ec865) New changes: 20c61ec Follow-up Id9597fde: Restore toolbar-bar class Change-Id: Ia16292b3ee46f5b38ee216927a9796a8fdf9235d --- resources/lib/oojs-ui/oojs-ui-apex.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.js | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui.js | 8 +++++--- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 7db8c39458..901b2ffe19 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:48Z + * Date: 2014-11-20T18:41:36Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 53d40d5e61..0ef5aa173c 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:37Z + * Date: 2014-11-20T18:41:26Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css b/resources/lib/oojs-ui/oojs-ui-apex.svg.css index 63acf8373d..c50ad4f00a 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:48Z + * Date: 2014-11-20T18:41:36Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index 6518cbcbbe..11e6204be2 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:48Z + * Date: 2014-11-20T18:41:36Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index d447a38169..e2520a1b88 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:37Z + * Date: 2014-11-20T18:41:26Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index f67ecdba0e..63d5399a9a 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:48Z + * Date: 2014-11-20T18:41:36Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index d7b79ddf7e..80d4c1de85 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (1fa4eb7a73) + * OOjs UI v0.1.0-pre (20c61ec865) * 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-11-20T00:05:37Z + * Date: 2014-11-20T18:41:26Z */ ( function ( OO ) { @@ -5287,7 +5287,9 @@ OO.ui.Toolbar = function OoUiToolbar( toolFactory, toolGroupFactory, config ) { if ( config.actions ) { this.$bar.append( this.$actions.addClass( 'oo-ui-toolbar-actions' ) ); } - this.$bar.append( this.$group, '
' ); + this.$bar + .addClass( 'oo-ui-toolbar-bar' ) + .append( this.$group, '
' ); if ( config.shadow ) { this.$bar.append( '
' ); } -- 2.20.1