[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix: Inline template editor goes full screen width

2016-12-07 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix: Inline template editor goes full screen width
..


Fix: Inline template editor goes full screen width

Bug: T152524
Change-Id: I2b84686fd314935b7198a2e5478d99c9a2e04d4d
---
M modules/tools/ext.cx.tools.template.js
M modules/tools/styles/ext.cx.tools.template.editor.less
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Nikerabbit: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index 13fe349..692d1e3 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -289,7 +289,7 @@
 
if ( this.options.inline ) {
this.$parentSection = this.$parentSection ||
-   this.$template.parents( 
mw.cx.getSectionSelector() );
+   this.$template.closest( 
mw.cx.getSectionSelector() );
$container = this.$parentSection;
} else {
$container = this.getFirstVisibleFragment() || 
this.$template;
diff --git a/modules/tools/styles/ext.cx.tools.template.editor.less 
b/modules/tools/styles/ext.cx.tools.template.editor.less
index 7f9c902..c0dbb74 100644
--- a/modules/tools/styles/ext.cx.tools.template.editor.less
+++ b/modules/tools/styles/ext.cx.tools.template.editor.less
@@ -4,11 +4,17 @@
 .cx-template-editor-source-container,
 .cx-template-editor-target-container {
.mw-ui-one-whole;
+   float: none;
height: 100%;
padding: 0 10px;
background-color: @gray-light;
border: 1px solid #ccc;
z-index: 9; // The sticky header on the top of page is with z-index 10
+   &::after {
+   content: '';
+   display: block;
+   clear: both;
+   }
 }
 
 // close button

-- 
To view, visit https://gerrit.wikimedia.org/r/325734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b84686fd314935b7198a2e5478d99c9a2e04d4d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix: Inline template editor goes full screen width

2016-12-06 Thread Santhosh (Code Review)
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325734

Change subject: Fix: Inline template editor goes full screen width
..

Fix: Inline template editor goes full screen width

Bug: T152524
Change-Id: I2b84686fd314935b7198a2e5478d99c9a2e04d4d
---
M modules/tools/ext.cx.tools.template.js
M modules/tools/styles/ext.cx.tools.template.editor.less
2 files changed, 7 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/34/325734/1

diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index 13fe349..692d1e3 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -289,7 +289,7 @@
 
if ( this.options.inline ) {
this.$parentSection = this.$parentSection ||
-   this.$template.parents( 
mw.cx.getSectionSelector() );
+   this.$template.closest( 
mw.cx.getSectionSelector() );
$container = this.$parentSection;
} else {
$container = this.getFirstVisibleFragment() || 
this.$template;
diff --git a/modules/tools/styles/ext.cx.tools.template.editor.less 
b/modules/tools/styles/ext.cx.tools.template.editor.less
index 7f9c902..2ed505f 100644
--- a/modules/tools/styles/ext.cx.tools.template.editor.less
+++ b/modules/tools/styles/ext.cx.tools.template.editor.less
@@ -4,11 +4,17 @@
 .cx-template-editor-source-container,
 .cx-template-editor-target-container {
.mw-ui-one-whole;
+   float: none;
height: 100%;
padding: 0 10px;
background-color: @gray-light;
border: 1px solid #ccc;
z-index: 9; // The sticky header on the top of page is with z-index 10
+   &::after {
+  content: '';
+  display: block;
+  clear: both;
+   }
 }
 
 // close button

-- 
To view, visit https://gerrit.wikimedia.org/r/325734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b84686fd314935b7198a2e5478d99c9a2e04d4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits