From 9f055ecf5510429fc23169cdf378d6793401c73a Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 27 Mar 2014 11:42:51 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (e9e435be5e) New changes: e9e435b Move padding rules for OutlineItemWidget from core to skins. Change-Id: I114530e2c63ad5ec8c1c69092e17a8c1ec2a4f3d --- resources/oojs-ui/oojs-ui-agora.css | 28 +++++++++++++++++++++++++ resources/oojs-ui/oojs-ui-apex.css | 28 +++++++++++++++++++++++++ resources/oojs-ui/oojs-ui.js | 4 ++-- resources/oojs-ui/oojs-ui.svg.css | 32 ++--------------------------- 4 files changed, 60 insertions(+), 32 deletions(-) diff --git a/resources/oojs-ui/oojs-ui-agora.css b/resources/oojs-ui/oojs-ui-agora.css index 6fbd7f4f74..8aedde533f 100644 --- a/resources/oojs-ui/oojs-ui-agora.css +++ b/resources/oojs-ui/oojs-ui-agora.css @@ -31,6 +31,34 @@ border-bottom: 1px solid #dddddd; } +.oo-ui-optionWidget.oo-ui-indicatedElement .oo-ui-labeledElement-label { + padding-right: 1.5em; +} + +.oo-ui-optionWidget-level-0 { + padding-left: 3.5em; +} + +.oo-ui-optionWidget-level-0 .oo-ui-iconedElement-icon { + left: 1em; +} + +.oo-ui-optionWidget-level-1 { + padding-left: 5em; +} + +.oo-ui-optionWidget-level-1 .oo-ui-iconedElement-icon { + left: 2.5em; +} + +.oo-ui-optionWidget-level-2 { + padding-left: 6.5em; +} + +.oo-ui-optionWidget-level-2 .oo-ui-iconedElement-icon { + left: 4em; +} + .oo-ui-buttonOptionWidget { padding: 0; } diff --git a/resources/oojs-ui/oojs-ui-apex.css b/resources/oojs-ui/oojs-ui-apex.css index 8e2d79d423..338edd3c96 100644 --- a/resources/oojs-ui/oojs-ui-apex.css +++ b/resources/oojs-ui/oojs-ui-apex.css @@ -576,6 +576,34 @@ font-size: 1.1em; } +.oo-ui-outlineItemWidget.oo-ui-indicatedElement .oo-ui-labeledElement-label { + padding-right: 1.5em; +} + +.oo-ui-outlineItemWidget-level-0 { + padding-left: 3.5em; +} + +.oo-ui-outlineItemWidget-level-0 .oo-ui-iconedElement-icon { + left: 1em; +} + +.oo-ui-outlineItemWidget-level-1 { + padding-left: 5em; +} + +.oo-ui-outlineItemWidget-level-1 .oo-ui-iconedElement-icon { + left: 2.5em; +} + +.oo-ui-outlineItemWidget-level-2 { + padding-left: 6.5em; +} + +.oo-ui-outlineItemWidget-level-2 .oo-ui-iconedElement-icon { + left: 4em; +} + .oo-ui-outlineItemWidget.oo-ui-optionWidget-selected { text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); background-color: #a7dcff; diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js index 48ace0077d..b964a12e96 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 (e697490c9b) + * OOjs UI v0.1.0-pre (e9e435be5e) * 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: Wed Mar 26 2014 17:40:12 GMT-0700 (PDT) + * Date: Thu Mar 27 2014 11:42:46 GMT-0700 (PDT) */ ( function () { diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css index 9f8c28a664..1cc6189d65 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 (e697490c9b) + * OOjs UI v0.1.0-pre (e9e435be5e) * 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: Wed Mar 26 2014 17:40:12 GMT-0700 (PDT) + * Date: Thu Mar 27 2014 11:42:46 GMT-0700 (PDT) */ /* Textures */ @@ -977,34 +977,6 @@ -webkit-touch-callout: none; } -.oo-ui-outlineItemWidget.oo-ui-indicatedElement .oo-ui-labeledElement-label { - padding-right: 1.5em; -} - -.oo-ui-outlineItemWidget-level-0 { - padding-left: 3.5em; -} - -.oo-ui-outlineItemWidget-level-0 .oo-ui-iconedElement-icon { - left: 1em; -} - -.oo-ui-outlineItemWidget-level-1 { - padding-left: 5em; -} - -.oo-ui-outlineItemWidget-level-1 .oo-ui-iconedElement-icon { - left: 2.5em; -} - -.oo-ui-outlineItemWidget-level-2 { - padding-left: 6.5em; -} - -.oo-ui-outlineItemWidget-level-2 .oo-ui-iconedElement-icon { - left: 4em; -} - .oo-ui-popupButtonWidget { position: relative; } -- 2.20.1