jenkins-bot has submitted this change and it was merged.
Change subject: WindowManager: Only apply `top: 1em; bottom: 1em;` to
non-fullscreen windows
......................................................................
WindowManager: Only apply `top: 1em; bottom: 1em;` to non-fullscreen windows
This was already supposed to be overridden in WindowManager.less
(see `&-fullscreen > .oo-ui-dialog > .oo-ui-window-frame`), but that
rule has the same specificity as this one and it was earlier in the
file, so it was being ignored.
I think a lot of this CSS could be moved to WindowManager.less and
made to apply only to fullscreen or floating windows, but it would
have to be done carefully.
Bug: T122238
Change-Id: I50fb372cf3c9dcc03d3677ffd27f4ea37cdfe610
---
M src/themes/apex/windows.less
M src/themes/mediawiki/windows.less
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 9489a30..80bf272 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -290,8 +290,6 @@
.oo-ui-transition(opacity @medium-ease);
> .oo-ui-window-frame {
- top: 1em;
- bottom: 1em;
background-color: #fff;
opacity: 0;
@@ -314,6 +312,8 @@
}
&-modal&-floating > .oo-ui-dialog > .oo-ui-window-frame {
+ top: 1em;
+ bottom: 1em;
border: 1px solid #ccc;
border-radius: 0.5em;
box-shadow: 0 0.2em 1em rgba(0, 0, 0, 0.3);
diff --git a/src/themes/mediawiki/windows.less
b/src/themes/mediawiki/windows.less
index 254bcf5..07dab75 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -268,8 +268,6 @@
.oo-ui-transition( opacity @transition-ease-medium );
> .oo-ui-window-frame {
- top: 1em;
- bottom: 1em;
background-color: #fff;
opacity: 0;
.oo-ui-transform( scale( 0.5 ) );
@@ -291,6 +289,8 @@
}
&-modal&-floating > .oo-ui-dialog > .oo-ui-window-frame {
+ top: 1em;
+ bottom: 1em;
border: 1px solid #aaa;
border-radius: @border-radius-default;
box-shadow: @box-shadow-dialog;
--
To view, visit https://gerrit.wikimedia.org/r/266236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50fb372cf3c9dcc03d3677ffd27f4ea37cdfe610
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
