[MediaWiki-commits] [Gerrit] Toolbar should appear to be within text area - change (mediawiki...Flow)

2015-03-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Toolbar should appear to be within text area
..


Toolbar should appear to be within text area

Note that this completely fails when the debugBar is also present, havn't
thought of how to fix that yet.

Bug: T94112
Change-Id: I63613e96f3116745726326a254f5ac3f220f5f61
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
1 file changed, 18 insertions(+), 2 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less 
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 736fafe..6076edf 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -23,11 +23,27 @@
// this border comes from .mw-ui-input on the same div, but i 
dont think
// we want to remove this for all inputs just the documentNode
border: none;
+   // This creates a space for the toolbar, a matching negative 
margin-top
+   // shifts the toolbar into this location.
+   // @todo where did this 40 come from, could it be calculated?
+   padding-bottom: 40px;
}
 
-   // The default border is only appropriate in the default ve, with
-   // the toolbar above the editing surface.
+   .oo-ui-toolbar {
+   // The -40 matches the padding-bottom on .ve-ce-documentNode to 
put the toolbar inside
+   // the editing area. The 2px of positive margin gives room for 
the blue border of the
+   // documentNode (via .mw-ui-input)
+   margin: -40px 2px 0 2px;
+   }
+
+   // Due to this being floated, it needs a matching top margin to still 
display inside the bar
+   .oo-ui-toolbar-actions {
+   margin-top: 38px;
+   }
+
.oo-ui-toolbar-bar {
+   // The default border is only appropriate in the default ve, 
with
+   // the toolbar above the editing surface.
border: none;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63613e96f3116745726326a254f5ac3f220f5f61
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Toolbar should appear to be within text area - change (mediawiki...Flow)

2015-03-27 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review.

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

Change subject: Toolbar should appear to be within text area
..

Toolbar should appear to be within text area

Note that this completely fails when the debugBar is also present, havn't
thought of how to fix that yet.

Bug: T94112
Change-Id: I63613e96f3116745726326a254f5ac3f220f5f61
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
1 file changed, 19 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/65/200265/1

diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less 
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index f09f622..c4eca13 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -14,6 +14,10 @@
// this border comes from .mw-ui-input on the same div, but i 
dont think
// we want to remove this for all inputs just the documentNode
border: none;
+   // This creates a space for the toolbar, a matching negative 
margin-top
+   // shifts the toolbar into this location.
+   // @todo where did this 40 come from (guesstimate from 
inspector)?
+   padding-bottom: 40px;
}
 
// Core, VE and OOjs UI do use other models in some cases, so we
@@ -23,9 +27,22 @@
.box-sizing(border-box);
}
 
-   // The default border is only appropriate in the default ve, with
-   // the toolbar above the editing surface.
+   .oo-ui-toolbar {
+   // The -38 matches the padding-bottom on .ve-ce-documentNode to 
put the toolbar inside
+   // the editing area.  The 2px of positive margin gives room for 
the blue border of the
+   // documentNode (via .mw-ui-input)
+   margin: -40px 2px 0 2px;
+
+   }
+
+   // Due to this being floated, it needs a matching top margin to still 
display inside the bar
+   .oo-ui-toolbar-actions {
+   margin-top: 38px;
+   }
+
.oo-ui-toolbar-bar {
+   // The default border is only appropriate in the default ve, 
with
+   // the toolbar above the editing surface.
border: none;
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63613e96f3116745726326a254f5ac3f220f5f61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org

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