From: James D. Forrester Date: Thu, 1 May 2014 19:36:20 +0000 (-0700) Subject: Update OOjs UI to v0.1.0-pre (301887f487) X-Git-Tag: 1.31.0-rc.0~15928 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=108340d4bca62e5fa723b59fda20968af282e80e;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.1.0-pre (301887f487) New changes: d641133 Add Agora theme dialogs Change-Id: Ia43507e933bf728b6a8f1d15b2fc0ffb8e998ae3 --- diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css b/resources/lib/oojs-ui/oojs-ui-agora.css index 8aedde533f..5a69a2c75b 100644 --- a/resources/lib/oojs-ui/oojs-ui-agora.css +++ b/resources/lib/oojs-ui/oojs-ui-agora.css @@ -1,3 +1,23 @@ +.oo-ui-dialog-content .oo-ui-window-closeButton { + position: absolute; + top: 0; + left: 0; +} + +.oo-ui-dialog-content .oo-ui-window-icon { + margin-left: 3.35em; +} + +.oo-ui-dialog-content .oo-ui-window-body { + position: relative; +} + +.oo-ui-dialog-medium .oo-ui-window-frame { + top: 0; + bottom: 0; + background-color: white; +} + .oo-ui-window-head { height: 3.35em; border-bottom: 1px solid #dddddd; diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index ac0780224b..4a744e46f8 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -9,7 +9,47 @@ transition: all 250ms ease-in-out; } +.oo-ui-dialog-content .oo-ui-window-head, +.oo-ui-dialog-content .oo-ui-window-body, +.oo-ui-dialog-content .oo-ui-window-foot { + position: absolute; + right: 0; + left: 0; + overflow: hidden; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.oo-ui-dialog-content .oo-ui-window-head { + top: 0; + height: 3.8em; + padding: 0.5em; +} + +.oo-ui-dialog-content .oo-ui-window-title { + line-height: 2.8em; +} + +.oo-ui-dialog-content .oo-ui-window-icon { + width: 2.4em; + height: 2.8em; + line-height: 2.8em; +} + +.oo-ui-dialog-content .oo-ui-window-closeButton { + float: right; + margin: 0.25em 0.25em; +} + +.oo-ui-dialog-content .oo-ui-window-body { + top: 3.8em; + bottom: 4.8em; +} + .oo-ui-dialog > .oo-ui-window-frame { + top: 1em; + bottom: 1em; background-color: #fff; border: solid 1px #ccc; border-radius: 0.5em; @@ -26,6 +66,21 @@ transition: all 250ms ease-in-out; } +.oo-ui-dialog-small .oo-ui-window-frame { + width: 400px; + max-height: 230px; +} + +.oo-ui-dialog-medium .oo-ui-window-frame { + width: 600px; + max-height: 460px; +} + +.oo-ui-dialog-large .oo-ui-window-frame { + width: 800px; + max-height: 690px; +} + .oo-ui-dialog-open { opacity: 1; } @@ -309,6 +364,18 @@ font-size: 1.5em; } +.oo-ui-panelLayout { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; +} + +.oo-ui-panelLayout-padded { + padding: 2em; +} + .oo-ui-barToolGroup .oo-ui-tool { margin: -1px 0 -1px -1px; border: solid 1px transparent; diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 92d737867b..bc8522eea1 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 (bdbb9cfa55) + * OOjs UI v0.1.0-pre (301887f487) * 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 Apr 30 2014 16:34:11 GMT-0700 (PDT) + * Date: Thu May 01 2014 12:36:15 GMT-0700 (PDT) */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 3a5268d16a..8109bf6c1a 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (bdbb9cfa55) + * OOjs UI v0.1.0-pre (301887f487) * 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 Apr 30 2014 16:34:11 GMT-0700 (PDT) + * Date: Thu May 01 2014 12:36:15 GMT-0700 (PDT) */ /* Textures */ @@ -55,9 +55,7 @@ .oo-ui-dialog > .oo-ui-window-frame { position: fixed; - top: 1em; right: 0; - bottom: 1em; left: 0; min-height: 12em; margin: auto; @@ -69,59 +67,6 @@ height: 100%; } -.oo-ui-dialog-small > .oo-ui-window-frame { - width: 400px; - max-height: 230px; -} - -.oo-ui-dialog-medium > .oo-ui-window-frame { - width: 600px; - max-height: 460px; -} - -.oo-ui-dialog-large > .oo-ui-window-frame { - width: 800px; - max-height: 690px; -} - -.oo-ui-dialog-content .oo-ui-window-head, -.oo-ui-dialog-content .oo-ui-window-body, -.oo-ui-dialog-content .oo-ui-window-foot { - position: absolute; - right: 0; - left: 0; - overflow: hidden; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.oo-ui-dialog-content .oo-ui-window-head { - top: 0; - height: 3.8em; - padding: 0.5em; -} - -.oo-ui-dialog-content .oo-ui-window-title { - line-height: 2.8em; -} - -.oo-ui-dialog-content .oo-ui-window-icon { - width: 2.4em; - height: 2.8em; - line-height: 2.8em; -} - -.oo-ui-dialog-content .oo-ui-window-closeButton { - float: right; - margin: 0.25em 0.25em; -} - -.oo-ui-dialog-content .oo-ui-window-body { - top: 3.8em; - bottom: 4.8em; -} - .oo-ui-dialog-content .oo-ui-window-foot { bottom: 0; height: 4.8em; @@ -466,22 +411,10 @@ padding: 0.5em 0; } -.oo-ui-panelLayout { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-panelLayout-padded { - padding: 2em; -} - .oo-ui-stackLayout > .oo-ui-panelLayout { display: none; }