jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404070 )
Change subject: CX1: Fix translation view UI overlaps
......................................................................
CX1: Fix translation view UI overlaps
- Integrate infobar messages into main piece of content, matching the
width of header after Id77aa5be3e80.
- Fix inaccessible publish target namespace menu.
Bug: T184662
Bug: T184130
Change-Id: Ic391b24d880bbd314c8fd5dafb583ec98a25bbd2
(cherry picked from commit 4c082cc2819cc6fd1ca8e8654937508a12406e2d)
---
M modules/ui/legacy/styles/mw.cx.ui.Header.less
M modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
M modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
M modules/ui/styles/mw.cx.ui.Infobar.less
M modules/widgets/common/ext.cx.common.less
5 files changed, 16 insertions(+), 6 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ui/legacy/styles/mw.cx.ui.Header.less
b/modules/ui/legacy/styles/mw.cx.ui.Header.less
index 3502669..d2ad30c 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.Header.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.Header.less
@@ -16,7 +16,7 @@
}
.cx-header:not( .cx-header--dashboard ) > .cx-header__main {
- padding: 10px;
+ padding: @personal-header-padding;
}
.cx-header__trademark {
@@ -106,7 +106,7 @@
.cx-header__main,
.cx-header__trademark {
- min-height: 2.5em;
+ min-height: @personal-header-height;
}
.cx-header__main:after {
@@ -136,6 +136,10 @@
@media only screen and ( max-width: ( @very-narrow - 1px ) ) {
padding: 10px 12px 0;
}
+}
+
+.cx-header-infobar {
+ .mw-ui-two-thirds;
}
.cx-header__bar-container {
@@ -197,6 +201,7 @@
left: 0;
width: 66.666%;
+ height: @header-bar-height-legacy;
padding: 0;
.box-shadow( 0 2px 2px 0 rgba( 0, 0, 0, 0.25 ) );
diff --git a/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
b/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
index fa6ec82..0fcece6 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
@@ -2,15 +2,15 @@
.cx-column--tools {
.mw-ui-one-whole(@palm);
+ .stick-to-side;
background-color: @colorGray14;
min-height: 100vh;
- position: relative;
- top: -@header-bar-height-legacy;
+ top: @personal-header-height + 2 * @personal-header-padding;
border-left: 1px solid @colorGray12;
&.sticky {
- .stick-to-side;
+ top: 0;
@media @palm {
.stick-to-bottom;
diff --git a/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
b/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
index 2c7b5e2..ea4d579 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
@@ -1,6 +1,10 @@
@import '../../../widgets/common/ext.cx.common.less';
@import '../../../widgets/common/ext.cx.highlight.less';
+.cx-column.cx-column--translation {
+ z-index: auto;
+}
+
.cx-column--translation {
[contenteditable] {
outline: 0;
diff --git a/modules/ui/styles/mw.cx.ui.Infobar.less
b/modules/ui/styles/mw.cx.ui.Infobar.less
index 516e57d..bba6d92 100644
--- a/modules/ui/styles/mw.cx.ui.Infobar.less
+++ b/modules/ui/styles/mw.cx.ui.Infobar.less
@@ -1,6 +1,5 @@
@import '../../widgets/common/ext.cx.common.less';
.cx-header-infobar {
- .mw-ui-item;
.mw-ui-one-whole;
}
diff --git a/modules/widgets/common/ext.cx.common.less
b/modules/widgets/common/ext.cx.common.less
index b6b9bd3..884d81c 100644
--- a/modules/widgets/common/ext.cx.common.less
+++ b/modules/widgets/common/ext.cx.common.less
@@ -17,6 +17,8 @@
@max-dashboard-width: 1500px;
@header-bar-height-legacy: 40px;
+@personal-header-height: 2.5em;
+@personal-header-padding: 0.625em;
.box-shadow-card() {
.box-shadow( 0 1px 1px rgba( 0, 0, 0, 0.15 ) );
--
To view, visit https://gerrit.wikimedia.org/r/404070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic391b24d880bbd314c8fd5dafb583ec98a25bbd2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.31.0-wmf.16
Gerrit-Owner: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Petar.petkovic <ppetko...@wikimedia.org>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
