jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348881 )
Change subject: Update OOjs UI to v0.21.1 ...................................................................... Update OOjs UI to v0.21.1 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.1 Change-Id: I5edcf21effee760d9951965a152481f2c603b59b --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/README.md M oojs/oojs-ui/demos/pages/toolbars.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/pages/widgets.php M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/jv.json M oojs/oojs-ui/package.json 11 files changed, 256 insertions(+), 114 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/composer.json b/composer.json index 060cea0..25b488c 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.22.1", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.21.0", + "oojs/oojs-ui": "0.21.1", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index afa7167..f2416a4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], - "content-hash": "cef3fe39dce79bd5ec5b2b4d83e63289", + "content-hash": "0504cf9f775f597b7227cc031c0faee2", "packages": [ { "name": "composer/semver", @@ -466,16 +466,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.21.0", + "version": "v0.21.1", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "f8c175f7c3934573715fb97d3c1a64f8f0d365f0" + "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/f8c175f7c3934573715fb97d3c1a64f8f0d365f0";, - "reference": "f8c175f7c3934573715fb97d3c1a64f8f0d365f0", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537";, + "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537", "shasum": "" }, "require": { @@ -541,7 +541,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2017-04-11T22:11:33+00:00" + "time": "2017-04-18T23:06:13+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 9a82fa9..d1b6acd 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2112,17 +2112,17 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.21.0", - "version_normalized": "0.21.0.0", + "version": "v0.21.1", + "version_normalized": "0.21.1.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "f8c175f7c3934573715fb97d3c1a64f8f0d365f0" + "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/f8c175f7c3934573715fb97d3c1a64f8f0d365f0";, - "reference": "f8c175f7c3934573715fb97d3c1a64f8f0d365f0", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537";, + "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537", "shasum": "" }, "require": { @@ -2134,7 +2134,7 @@ "mediawiki/mediawiki-codesniffer": "0.6.0", "phpunit/phpunit": "4.8.21" }, - "time": "2017-04-11T22:11:33+00:00", + "time": "2017-04-18T23:06:13+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md index 58e3bd0..f6e9955 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,4 +1,32 @@ # OOjs UI Release History +## v0.21.1 / 2017-04-18 +### Styles +* PopupWidget: Do not leave space for anchor if there's no anchor (Bartosz Dziewoński) +* MediaWiki theme: Ensure WCAG level AA contrast on unsupported SelectFileWidget (Volker E) +* MediaWiki theme: Fit icon/indicator & label in DecoratedOptionWidget (Volker E) +* MediaWiki theme: Fix standalone, disabled sibling ButtonWidgets (Volker E) +* MediaWiki theme: Fix white `border-color` of frameless buttons (Volker E) +* MediaWiki theme: Make readonly TextInputWidget appearance clearer (Volker E) +* MediaWiki theme: TagMultiselectWidget outlined UI improvements (Volker E) +* MenuOptionWidget: Remove theme-independent 'check' icon (Prateek Saxena) + +### Code +* environment: Upgrade jQuery from 1.11.3 to 3.2.1 (James D. Forrester) +* DropdownInput-/RadioSelectInputWidget: Remove unnecessary ARIA attributes (Volker E) +* Element: Use `JSON.parse` rather than the deprecated `$.parseJSON` (James D. Forrester) +* Fix typo in frameless button mixin (David Lynch) +* FloatingMenuSelectWidget: Add 'ready' event after menu is clipped (Moriel Schottlender) +* MediaWiki theme: Clarify `@min-height-widget-default` usage (Volker E) +* PopupToolGroup: Mixin flaggable (David Lynch) +* TagMultiselectWidget: Allow preset InputWidget (Moriel Schottlender) +* TagMultiselectWidget: Redo data validation for Tag* and Menu* (Moriel Schottlender) +* themes: Align `@size-*-min` variable to naming scheme and rename (Volker E) +* build: Drop the csscomb task (James D. Forrester) +* docs: Fix numbering in Quick start (Kartik Mistry) +* demos: Polish demo labels, styles and add frameless button tests (Volker E) +* tests: Update OO.ui.Process tests for jQuery 3 compatibility (Bartosz Dziewoński) + + ## v0.21.0 / 2017-04-11 ### Breaking changes * [BREAKING CHANGE] ActionWidget: Remove resize event (IvanFon) diff --git a/oojs/oojs-ui/README.md b/oojs/oojs-ui/README.md index 64ebc56..5cbc067 100644 --- a/oojs/oojs-ui/README.md +++ b/oojs/oojs-ui/README.md @@ -17,17 +17,17 @@ 1. Clone the repo and move into it, `$ git clone https://phabricator.wikimedia.org/diffusion/GOJU/oojs-ui.git oojs-ui && cd oojs-ui`. -1. Install Grunt command-line utility:<br/>`$ npm install -g grunt-cli` +2. Install Grunt command-line utility:<br/>`$ npm install -g grunt-cli` -1. Install [composer](https://getcomposer.org/download/) and make sure running `composer` will execute it (*e.g.* add it to `$PATH` in POSIX environments). +3. Install [composer](https://getcomposer.org/download/) and make sure running `composer` will execute it (*e.g.* add it to `$PATH` in POSIX environments). -1. Install dev dependencies:<br/>`$ npm install` +4. Install dev dependencies:<br/>`$ npm install` -1. Build the library (you can alternatively use `grunt quick-build` if you don't need to rebuild the PNGs):<br/>`$ grunt build` +5. Build the library (you can alternatively use `grunt quick-build` if you don't need to rebuild the PNGs):<br/>`$ grunt build` -1. You can now copy the distribution files from the dist directory into your project. +6. You can now copy the distribution files from the dist directory into your project. -1. You can see a suite of demos in `/demos` by executing:<br/>`$ npm run-script demos` +7. You can see a suite of demos in `/demos` by executing:<br/>`$ npm run-script demos` Loading the library diff --git a/oojs/oojs-ui/demos/pages/toolbars.js b/oojs/oojs-ui/demos/pages/toolbars.js index ff29152..f31fc41 100644 --- a/oojs/oojs-ui/demos/pages/toolbars.js +++ b/oojs/oojs-ui/demos/pages/toolbars.js @@ -275,6 +275,7 @@ { type: 'list', indicator: 'down', + flags: [ 'primary', 'progressive' ], include: [ { group: 'listTools' } ] } ] ); diff --git a/oojs/oojs-ui/demos/pages/widgets.js b/oojs/oojs-ui/demos/pages/widgets.js index 3081ec4..c139838 100644 --- a/oojs/oojs-ui/demos/pages/widgets.js +++ b/oojs/oojs-ui/demos/pages/widgets.js @@ -188,12 +188,32 @@ ), new OO.ui.FieldLayout( new OO.ui.ButtonWidget( { + icon: 'help', + title: 'Icon only, framed' + } ), + { + label: 'ButtonWidget (icon only)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonWidget( { + indicator: 'alert', + title: 'Indicator only, framed' + } ), + { + label: 'ButtonWidget (indicator only)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonWidget( { framed: false, icon: 'help', title: 'Icon only' } ), { - label: 'ButtonWidget (icon only)\u200E', + label: 'ButtonWidget (frameless, icon only)\u200E', align: 'top' } ), @@ -204,27 +224,7 @@ title: 'Indicator only' } ), { - label: 'ButtonWidget (indicator only)\u200E', - align: 'top' - } - ), - new OO.ui.FieldLayout( - new OO.ui.ButtonWidget( { - icon: 'help', - title: 'Icon only, framed' - } ), - { - label: 'ButtonWidget (icon only, framed)\u200E', - align: 'top' - } - ), - new OO.ui.FieldLayout( - new OO.ui.ButtonWidget( { - indicator: 'alert', - title: 'Indicator only, framed' - } ), - { - label: 'ButtonWidget (indicator only, framed)\u200E', + label: 'ButtonWidget (frameless, indicator only)\u200E', align: 'top' } ), @@ -284,6 +284,17 @@ } ), { label: 'ButtonWidget (frameless, constructive)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonWidget( { + framed: false, + flags: [ 'destructive' ], + label: 'Cancel' + } ), + { + label: 'ButtonWidget (frameless, label-only, destructive)\u200E', align: 'top' } ), @@ -996,8 +1007,9 @@ label: 'The fourth option has a long label' } ), new OO.ui.MenuOptionWidget( { + icon: 'feedback', data: 'd', - label: 'Fifth' + label: 'The fifth option has an icon' } ) ] } @@ -1368,7 +1380,18 @@ inputPosition: 'outline' } ), { - label: 'TagMultiselectWidget (allowArbitrary, outline input, placeholder)', + label: 'TagMultiselectWidget (allowArbitrary, inputPosition:outline, placeholder)', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.TagMultiselectWidget( { + allowArbitrary: true, + inputPosition: 'outline', + inputWidget: new OO.ui.SearchInputWidget() + } ), + { + label: 'TagMultiselectWidget (inputwidget: OO.ui.SearchInputWidget, inputPosition:outline)', align: 'top' } ), @@ -2029,6 +2052,21 @@ } ), new OO.ui.FieldLayout( + new OO.ui.PopupButtonWidget( { + icon: 'menu', + label: 'Options', + popup: { + $content: $( '<p>' ).text( loremIpsum ), + padded: true, + anchor: false + } + } ), + { + label: 'PopupButtonWidget (no anchor)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( new Demo.NumberLookupTextInputWidget(), { label: 'LookupElement (try inputting an integer)\u200E', @@ -2368,14 +2406,42 @@ label: 'Remember me', align: 'inline' } + ) + ] + } ), + new OO.ui.FieldsetLayout( { + label: null, + items: [ + new OO.ui.FieldLayout( + new OO.ui.TextInputWidget(), + { + label: 'Summary', + align: 'top' + } ), new OO.ui.FieldLayout( - new OO.ui.ButtonInputWidget( { - name: 'login', - label: 'Log in', - type: 'submit', - flags: [ 'primary', 'progressive' ], - icon: 'check' + new OO.ui.Widget( { + content: [ new OO.ui.HorizontalLayout( { + items: [ + new OO.ui.ButtonInputWidget( { + name: 'login', + label: 'Log in', + type: 'submit', + flags: [ 'primary', 'progressive' ], + icon: 'userAvatar' + } ), + new OO.ui.ButtonWidget( { + framed: false, + flags: [ 'destructive' ], + label: 'Cancel' + } ), + new OO.ui.ButtonWidget( { + framed: false, + icon: 'tag', + label: 'Random icon button' + } ) + ] + } ) ] } ), { label: null, diff --git a/oojs/oojs-ui/demos/pages/widgets.php b/oojs/oojs-ui/demos/pages/widgets.php index 6d4a555..9d9daa2 100644 --- a/oojs/oojs-ui/demos/pages/widgets.php +++ b/oojs/oojs-ui/demos/pages/widgets.php @@ -167,7 +167,7 @@ 'title' => 'Icon only' ] ), [ - 'label' => "ButtonWidget (icon only)\xE2\x80\x8E", + 'label' => "ButtonWidget (frameless, icon only)\xE2\x80\x8E", 'align' => 'top' ] ), @@ -215,6 +215,17 @@ ] ), [ 'label' => "ButtonWidget (frameless, constructive)\xE2\x80\x8E", + 'align' => 'top' + ] + ), + new OOUI\FieldLayout( + new OOUI\ButtonWidget( [ + 'framed' => false, + 'flags' => [ 'destructive' ], + 'label' => 'Cancel' + ] ), + [ + 'label' => "ButtonWidget (frameless, label-only, destructive)\xE2\x80\x8E", 'align' => 'top' ] ), @@ -1080,13 +1091,43 @@ 'align' => 'inline', ] ), + ] + ] ), + new OOUI\FieldsetLayout( [ + 'label' => null, + 'items' => [ new OOUI\FieldLayout( - new OOUI\ButtonInputWidget( [ - 'name' => 'login', - 'label' => 'Log in', - 'type' => 'submit', - 'flags' => [ 'primary', 'progressive' ], - 'icon' => 'check', + new OOUI\TextInputWidget( [ + 'name' => 'summary', + ] ), + [ + 'label' => 'Summary', + 'align' => 'top', + ] + ), + new OOUI\FieldLayout( + new OOUI\Widget( [ + 'content' => new OOUI\HorizontalLayout( [ + 'items' => [ + new OOUI\ButtonInputWidget( [ + 'name' => 'login', + 'label' => 'Log in', + 'type' => 'submit', + 'flags' => [ 'primary', 'progressive' ], + 'icon' => 'userAvatar', + ] ), + new OOUI\ButtonInputWidget( [ + 'framed' => false, + 'flags' => [ 'destructive' ], + 'label' => 'Cancel', + ] ), + new OOUI\ButtonInputWidget( [ + 'framed' => false, + 'icon' => 'tag', + 'label' => 'Random icon button', + ] ), + ] + ] ), ] ), [ 'label' => null, @@ -1094,7 +1135,7 @@ ] ), ] - ] ) + ] ), ] ] ) ); diff --git a/oojs/oojs-ui/demos/styles/demo.css b/oojs/oojs-ui/demos/styles/demo.css index ae9cc7e..2343b27 100644 --- a/oojs/oojs-ui/demos/styles/demo.css +++ b/oojs/oojs-ui/demos/styles/demo.css @@ -1,8 +1,8 @@ body { color: #222; margin: 1em; - font-size: 0.8em; font-family: sans-serif; + font-size: 0.8em; } p { @@ -35,56 +35,6 @@ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -} - -/* Toolbars demo */ - -.demo-container.demo-toolbars { - padding: 0; - margin-bottom: 2em; -} - -.demo-toolbars-contents { - padding: 2em; - min-height: 100px; -} - -/* Icons demo */ - -.demo-icons .oo-ui-buttonSelectWidget { - margin-bottom: 2em; -} - -.demo-icons .oo-ui-fieldLayout { - display: inline-block; - margin: 1em 1em 1em 0; - width: 13.75em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.demo-icons .oo-ui-fieldLayout:nth-child( 4n ) { - margin-right: 0; -} - -.demo-icons .oo-ui-fieldLayout .oo-ui-iconElement, -.demo-icons .oo-ui-fieldLayout .oo-ui-indicatorElement { - opacity: 0.8; /* brings icons/indicators closer to text color */ -} - -.demo-icons .oo-ui-fieldLayout:hover .oo-ui-labelElement-label { - color: #000; -} -.demo-icons .oo-ui-fieldLayout:hover .oo-ui-iconElement, -.demo-icons .oo-ui-fieldLayout:hover .oo-ui-indicatorElement { - opacity: 1; -} - -/* Widgets demo */ - -.oo-ui-horizontalLayout > .oo-ui-textInputWidget, -.oo-ui-horizontalLayout > .oo-ui-dropdownInputWidget { - max-width: 10em; } /* Console */ @@ -252,6 +202,56 @@ color: #444; } +/* Toolbars demo */ + +.demo-container.demo-toolbars { + padding: 0; + margin-bottom: 2em; +} + +.demo-toolbars-contents { + padding: 2em; + min-height: 100px; +} + +/* Icons demo */ + +.demo-icons .oo-ui-buttonSelectWidget { + margin-bottom: 2em; +} + +.demo-icons .oo-ui-fieldLayout { + display: inline-block; + margin: 1em 1em 1em 0; + width: 13.75em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.demo-icons .oo-ui-fieldLayout:nth-child( 4n ) { + margin-right: 0; +} + +.demo-icons .oo-ui-fieldLayout .oo-ui-iconElement, +.demo-icons .oo-ui-fieldLayout .oo-ui-indicatorElement { + opacity: 0.8; /* brings icons/indicators closer to text color */ +} + +.demo-icons .oo-ui-fieldLayout:hover .oo-ui-labelElement-label { + color: #000; +} +.demo-icons .oo-ui-fieldLayout:hover .oo-ui-iconElement, +.demo-icons .oo-ui-fieldLayout:hover .oo-ui-indicatorElement { + opacity: 1; +} + +/* Widgets demo */ + +.oo-ui-horizontalLayout > .oo-ui-textInputWidget, +.oo-ui-horizontalLayout > .oo-ui-dropdownInputWidget { + max-width: 10em; +} + /* Special cases: ActionFieldLayout top aligned, FieldLayout left & right aligned */ .oo-ui-fieldLayout-align-left, @@ -271,6 +271,13 @@ display: block; } +/* Special case: FieldsetLayout with "Summary" */ +.oo-ui-formLayout .oo-ui-fieldsetLayout:last-child { + background-color: #eaecf0; + border: 1px solid #c8ccd1; + padding: 1em 1em 1.5em 1em; +} + /* Media Queries */ @media ( max-width: 750px ) { body { diff --git a/oojs/oojs-ui/i18n/jv.json b/oojs/oojs-ui/i18n/jv.json index 546cc47..25aff68 100644 --- a/oojs/oojs-ui/i18n/jv.json +++ b/oojs/oojs-ui/i18n/jv.json @@ -14,14 +14,14 @@ "ooui-toolbar-more": "Liyané", "ooui-toolgroup-expand": "Liyané", "ooui-toolgroup-collapse": "Sacukupé", - "ooui-dialog-message-accept": "Ha'a", + "ooui-dialog-message-accept": "Oké", "ooui-dialog-message-reject": "Wurung", "ooui-dialog-process-error": "Ana sing klèru", "ooui-dialog-process-dismiss": "Tutup", "ooui-dialog-process-retry": "Jajal manèh", - "ooui-dialog-process-continue": "Banjuraké", + "ooui-dialog-process-continue": "Bacutaké", "ooui-selectfile-button-select": "Pilih barkas", - "ooui-selectfile-not-supported": "Barkas pilihan ora disengkuyung", + "ooui-selectfile-not-supported": "Ora bisa milih barkas", "ooui-selectfile-placeholder": "Ora ana barkas sing dipilih", "ooui-selectfile-dragdrop-placeholder": "Dèkèk barkas ing kéné" } diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index 381572d..6ac8d60 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.21.0", + "version": "0.21.1", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", @@ -22,7 +22,7 @@ "jenkins": "npm test && jsduck && npm run postdoc" }, "dependencies": { - "jquery": "1.11.3", + "jquery": "3.2.1", "oojs": "2.0.0" }, "devDependencies": { @@ -36,7 +36,6 @@ "grunt-contrib-less": "1.4.1", "grunt-contrib-uglify": "2.2.0", "grunt-contrib-watch": "1.0.0", - "grunt-csscomb": "git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1", "grunt-cssjanus": "0.4.0", "grunt-eslint": "19.0.0", "grunt-exec": "1.0.1", -- To view, visit https://gerrit.wikimedia.org/r/348881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5edcf21effee760d9951965a152481f2c603b59b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: VolkerE <volke...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
