aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-15 20:37:48 -0800
committerJose Antonio Marquez2012-02-15 20:37:48 -0800
commit89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch)
tree4d29118f35df77ca6b423119a4ff61694a442cbf /scss/imports
parent9d2c2a80483415d7560b00cda5519153db23e241 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'scss/imports')
-rwxr-xr-x[-rw-r--r--]scss/imports/codemirror/_codemirror.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/codemirror/_css.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/codemirror/_javascript.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_Base.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_Components.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_MainWindow.scss2
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_MenuUI.scss0
-rw-r--r--scss/imports/scss/_MontageOverrides.scss19
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_PanelUI.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_ScrollBars.scss0
-rw-r--r--scss/imports/scss/_Stage.scss14
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_Tools.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_ToolsSample.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_UserContent.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_mixins.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_toolbar.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/themes/_test.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/themes/default/_colors.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/themes/default/_fonts.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/themes/default/_mixins.scss0
20 files changed, 20 insertions, 15 deletions
diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
index 281e7a9a..281e7a9a 100644..100755
--- a/scss/imports/codemirror/_codemirror.scss
+++ b/scss/imports/codemirror/_codemirror.scss
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
index fb870e84..fb870e84 100644..100755
--- a/scss/imports/codemirror/_css.scss
+++ b/scss/imports/codemirror/_css.scss
diff --git a/scss/imports/codemirror/_javascript.scss b/scss/imports/codemirror/_javascript.scss
index 1124e279..1124e279 100644..100755
--- a/scss/imports/codemirror/_javascript.scss
+++ b/scss/imports/codemirror/_javascript.scss
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index a800610d..a800610d 100644..100755
--- a/scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
diff --git a/scss/imports/scss/_Components.scss b/scss/imports/scss/_Components.scss
index c4182c73..c4182c73 100644..100755
--- a/scss/imports/scss/_Components.scss
+++ b/scss/imports/scss/_Components.scss
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index a2d5eef4..b7c7f4b7 100644..100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -67,7 +67,7 @@
67 width:100%; 67 width:100%;
68 top:0px; 68 top:0px;
69 left:0px; 69 left:0px;
70 z-index: 9999; 70 z-index: 6995;
71} 71}
72 72
73#topPanelContainer, 73#topPanelContainer,
diff --git a/scss/imports/scss/_MenuUI.scss b/scss/imports/scss/_MenuUI.scss
index e1fb149a..e1fb149a 100644..100755
--- a/scss/imports/scss/_MenuUI.scss
+++ b/scss/imports/scss/_MenuUI.scss
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss
new file mode 100644
index 00000000..65b9ede0
--- /dev/null
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -0,0 +1,19 @@
1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5// </copyright>
6
7
8//MontageOverrides.scss
9//Montage overrides.
10//Note that colors and font definitions go in
11//_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
12
13.montage-modal {
14 border: 0px;
15
16}
17.montage-popup-container {
18 background: none;
19} \ No newline at end of file
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index bccea6fc..bccea6fc 100644..100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
diff --git a/scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss
index 1c2f30ea..1c2f30ea 100644..100755
--- a/scss/imports/scss/_ScrollBars.scss
+++ b/scss/imports/scss/_ScrollBars.scss
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index e77be724..7b7db576 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,17 +192,3 @@
192 overflow-x: auto; 192 overflow-x: auto;
193 overflow-y: auto; 193 overflow-y: auto;
194} 194}
195.montage-editor-frame {
196 position:absolute;
197 z-index:7;
198 top: 0;
199 left:0;
200 display:none;
201 -webkit-user-select: initial;
202}
203.montage-editor {
204 padding:0px;
205 word-wrap: normal;
206
207
208 }
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 935c4cd6..935c4cd6 100644..100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
diff --git a/scss/imports/scss/_ToolsSample.scss b/scss/imports/scss/_ToolsSample.scss
index 2e1da9a8..2e1da9a8 100644..100755
--- a/scss/imports/scss/_ToolsSample.scss
+++ b/scss/imports/scss/_ToolsSample.scss
diff --git a/scss/imports/scss/_UserContent.scss b/scss/imports/scss/_UserContent.scss
index e2e89186..e2e89186 100644..100755
--- a/scss/imports/scss/_UserContent.scss
+++ b/scss/imports/scss/_UserContent.scss
diff --git a/scss/imports/scss/_mixins.scss b/scss/imports/scss/_mixins.scss
index 061262f7..061262f7 100644..100755
--- a/scss/imports/scss/_mixins.scss
+++ b/scss/imports/scss/_mixins.scss
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 048c1f88..048c1f88 100644..100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index 87735bec..87735bec 100644..100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index 2a7b8191..2a7b8191 100644..100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
diff --git a/scss/imports/themes/default/_fonts.scss b/scss/imports/themes/default/_fonts.scss
index 9174cff3..9174cff3 100644..100755
--- a/scss/imports/themes/default/_fonts.scss
+++ b/scss/imports/themes/default/_fonts.scss
diff --git a/scss/imports/themes/default/_mixins.scss b/scss/imports/themes/default/_mixins.scss
index 9f61e7ef..9f61e7ef 100644..100755
--- a/scss/imports/themes/default/_mixins.scss
+++ b/scss/imports/themes/default/_mixins.scss