From d48a02b68024ff85bb8d39c23197a6f221a64ede Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 23 Apr 2014 18:05:35 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (0a7180f468) New changes: 0a7180f Scope frame CSS to not affect child frames Change-Id: I7d8f6d102acd6877ede862876fc2f0632a6e02b2 --- resources/lib/oojs-ui/oojs-ui-apex.css | 4 ++-- resources/lib/oojs-ui/oojs-ui.js | 4 ++-- resources/lib/oojs-ui/oojs-ui.svg.css | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 9e6cc6db04..40e76d2451 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -9,7 +9,7 @@ transition: all 250ms ease-in-out; } -.oo-ui-dialog .oo-ui-window-frame { +.oo-ui-dialog > .oo-ui-window-frame { background-color: #fff; border: solid 1px #ccc; border-radius: 0.5em; @@ -30,7 +30,7 @@ opacity: 1; } -.oo-ui-dialog-open .oo-ui-window-frame { +.oo-ui-dialog-open > .oo-ui-window-frame { -webkit-transform: scale(1); -moz-transform: scale(1); -ms-transform: scale(1); diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 077087f5df..ff11631179 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 (497baca586) + * OOjs UI v0.1.0-pre (0a7180f468) * 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 23 2014 17:28:59 GMT-0700 (PDT) + * Date: Wed Apr 23 2014 18:05:30 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 83c3205de1..1dbb09813c 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 (497baca586) + * OOjs UI v0.1.0-pre (0a7180f468) * 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 23 2014 17:28:59 GMT-0700 (PDT) + * Date: Wed Apr 23 2014 18:05:30 GMT-0700 (PDT) */ /* Textures */ @@ -53,7 +53,7 @@ backface-visibility: hidden; } -.oo-ui-dialog .oo-ui-window-frame { +.oo-ui-dialog > .oo-ui-window-frame { position: fixed; top: 1em; right: 0; @@ -64,26 +64,26 @@ overflow: hidden; } -.oo-ui-dialog-small .oo-ui-window-frame { +.oo-ui-dialog > .oo-ui-window-frame .oo-ui-frame { + width: 100%; + height: 100%; +} + +.oo-ui-dialog-small > .oo-ui-window-frame { width: 400px; max-height: 230px; } -.oo-ui-dialog-medium .oo-ui-window-frame { +.oo-ui-dialog-medium > .oo-ui-window-frame { width: 600px; max-height: 460px; } -.oo-ui-dialog-large .oo-ui-window-frame { +.oo-ui-dialog-large > .oo-ui-window-frame { width: 800px; max-height: 690px; } -.oo-ui-dialog .oo-ui-frame { - width: 100%; - height: 100%; -} - .oo-ui-dialog-content .oo-ui-window-head, .oo-ui-dialog-content .oo-ui-window-body, .oo-ui-dialog-content .oo-ui-window-foot { -- 2.20.1