aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css')
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css7
1 files changed, 1 insertions, 6 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
index 0248c63e..f5b00e84 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
@@ -12,12 +12,7 @@
12} 12}
13 13
14.montage-editor { 14.montage-editor {
15 position: absolute; 15 position: relative;
16 top: 0;
17 left: 0;
18 bottom: 0;
19 right: 0;
20
21 outline: none; 16 outline: none;
22 overflow: auto; 17 overflow: auto;
23} 18}