From 950cf1377ff0d36587b51ba7d4649728050c5080 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 4 Mar 2014 11:26:34 -0800 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (8ac38a5c31) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit New changes: 0eef4f9 Make ButtonOptionWidget background transparent ba28817 Remove /* OO.ui.… */ comments from LESS theme files 8dad3cd Actually add new ButtonOptionWidget theme to build Change-Id: I20a0f5163dc23b8f2ff9067cb971ab0db7207f8e --- resources/oojs-ui/oojs-ui-apex.css | 47 +++--------------------------- resources/oojs-ui/oojs-ui.js | 4 +-- resources/oojs-ui/oojs-ui.svg.css | 4 +-- 3 files changed, 8 insertions(+), 47 deletions(-) diff --git a/resources/oojs-ui/oojs-ui-apex.css b/resources/oojs-ui/oojs-ui-apex.css index 256aa1fe74..468c78aefd 100644 --- a/resources/oojs-ui/oojs-ui-apex.css +++ b/resources/oojs-ui/oojs-ui-apex.css @@ -42,8 +42,6 @@ box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); } -/* OO.ui.Toolbar */ - .oo-ui-toolbar-bar { background: #f8fbfd; background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #ffffff), color-stop(100%, #f1f7fb)); @@ -73,8 +71,6 @@ transition: opacity 500ms ease-in-out; } -/* OO.ui.ToolGroup */ - .oo-ui-toolGroup { border: solid 1px transparent; border-radius: 0.25em; @@ -93,8 +89,6 @@ color: #000; } -/* OO.ui.Window */ - .oo-ui-window-title { color: #333; } @@ -105,8 +99,6 @@ line-height: 1.5em; } -/* OO.ui.ButtonedElement */ - .oo-ui-buttonedElement .oo-ui-buttonedElement-button { color: #333; } @@ -268,8 +260,6 @@ box-shadow: none; } -/* OO.ui.BookletLayout */ - .oo-ui-bookletLayout-outlinePanel { border-right: solid 1px #ddd; } @@ -278,8 +268,6 @@ box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } -/* OO.ui.FieldsetLayout */ - .oo-ui-fieldsetLayout { border: none; } @@ -288,8 +276,6 @@ font-size: 1.5em; } -/* OO.ui.BarToolGroup */ - .oo-ui-barToolGroup .oo-ui-tool { margin: -1px 0 -1px -1px; border: solid 1px transparent; @@ -343,8 +329,6 @@ opacity: 1; } -/* OO.ui.ListToolGroup */ - .oo-ui-listToolGroup.oo-ui-popupToolGroup-active { border-color: rgba(0, 0, 0, 0.2); } @@ -395,8 +379,6 @@ opacity: 0.2; } -/* OO.ui.MenuToolGroup */ - .oo-ui-menuToolGroup { border-color: rgba(0, 0, 0, 0.1); } @@ -413,8 +395,6 @@ background-color: #e1f3ff; } -/* OO.ui.PopupToolGroup */ - .oo-ui-popupToolGroup-handle .oo-ui-indicatedElement-indicator, .oo-ui-popupToolGroup-handle .oo-ui-iconedElement-icon { opacity: 0.8; @@ -440,8 +420,6 @@ box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07); } -/* OO.ui.OptionWidget */ - .oo-ui-optionWidget-highlighted { background-color: #e1f3ff; } @@ -450,8 +428,6 @@ background-color: #a7dcff; } -/* OO.ui.MenuWidget */ - .oo-ui-menuWidget { margin-top: -1px; background: #fff; @@ -460,8 +436,6 @@ box-shadow: 0 0.15em 1em 0 rgba(0, 0, 0, 0.2); } -/* OO.ui.PopupWidget */ - .oo-ui-popupWidget-popup { background-color: #fff; border: solid 1px #ccc; @@ -488,14 +462,15 @@ box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); } -/* OO.ui.ButtonGroupWidget */ - .oo-ui-buttonGroupWidget { display: inline-block; white-space: nowrap; } -/* OO.ui.ButtonSelectWidget */ +.oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected, +.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted { + background-color: transparent; +} .oo-ui-buttonSelectWidget { border-radius: 0.3em; @@ -517,8 +492,6 @@ border-bottom-right-radius: 0.3em; } -/* OO.ui.InlineMenuWidget */ - .oo-ui-inlineMenuWidget-handle { border: solid 1px rgba(0, 0, 0, 0.1); border-radius: 0.25em; @@ -533,14 +506,10 @@ opacity: 0.8; } -/* OO.ui.MenuItemWidget */ - .oo-ui-menuItemWidget.oo-ui-optionWidget-highlighted { background-color: #e1f3ff; } -/* OO.ui.OutlineControlsWidget */ - .oo-ui-outlineControlsWidget { background-color: #fff; } @@ -549,8 +518,6 @@ opacity: 0.2; } -/* OO.ui.OutlineItemWidget */ - .oo-ui-outlineItemWidget { font-size: 1.1em; } @@ -577,14 +544,10 @@ color: #777; } -/* OO.ui.SearchWidget */ - .oo-ui-searchWidget-query { box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.2); } -/* OO.ui.TextInputWidget */ - .oo-ui-textInputWidget input, .oo-ui-textInputWidget textarea { font-family: sans-serif; @@ -628,8 +591,6 @@ border-color: #ddd; } -/* OO.ui.ToggleSwitchWidget */ - .oo-ui-toggleSwitchWidget { background: #eeeeee; background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #dddddd), color-stop(100%, #ffffff)); diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js index 3efcdec803..39406bbc8e 100644 --- a/resources/oojs-ui/oojs-ui.js +++ b/resources/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (c57909a623) + * OOjs UI v0.1.0-pre (8ac38a5c31) * 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: Tue Mar 04 2014 10:34:19 GMT-0800 (PST) + * Date: Tue Mar 04 2014 11:26:29 GMT-0800 (PST) */ ( function () { diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css index f2d87372c5..5609496d2f 100644 --- a/resources/oojs-ui/oojs-ui.svg.css +++ b/resources/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (c57909a623) + * OOjs UI v0.1.0-pre (8ac38a5c31) * 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: Tue Mar 04 2014 10:34:19 GMT-0800 (PST) + * Date: Tue Mar 04 2014 11:26:29 GMT-0800 (PST) */ /* Textures */ -- 2.20.1