aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
Diffstat (limited to 'scss')
-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.scss2
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_Components.scss0
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_MainWindow.scss23
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_MenuUI.scss0
-rw-r--r--scss/imports/scss/_MontageOverrides.scss23
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_PanelUI.scss2
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_ScrollBars.scss0
-rw-r--r--scss/imports/scss/_Stage.scss13
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_Tools.scss33
-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.scss256
-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
-rwxr-xr-xscss/ninja.scss2
21 files changed, 168 insertions, 186 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 8a743174..a800610d 100644..100755
--- a/scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
@@ -134,7 +134,7 @@ button.nj-skinned {
134 cursor: pointer; 134 cursor: pointer;
135 text-shadow: 1px 1px 1px $color-app-shadow 135 text-shadow: 1px 1px 1px $color-app-shadow
136} 136}
137button.nj-skinned:active { 137button.nj-skinned:active, button.nj-skinned.active {
138 background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); 138 background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%);
139} 139}
140button.nj-skinned:hover { 140button.nj-skinned:hover {
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 23ace69b..97344b1e 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,
@@ -85,7 +85,7 @@
85#bottomPanelContainer { 85#bottomPanelContainer {
86 //border: 1px solid #333; 86 //border: 1px solid #333;
87 background: transparent; 87 background: transparent;
88 88 height: 150px;
89 min-height:80px; 89 min-height:80px;
90 max-height:50%; 90 max-height:50%;
91 overflow:auto; 91 overflow:auto;
@@ -200,15 +200,15 @@
200} 200}
201 201
202#mainContainer #rulerTop { 202#mainContainer #rulerTop {
203 // TODO: temporary background please replace when component is implemented 203 // TODO: temporary background please replace when component is implemented
204 background: url("../images/temp/ruler-top.png"); 204 background:$color-stage;
205 height:15px; 205 height:15px;
206 margin-bottom: 0px; 206 margin-bottom: 0px;
207} 207}
208 208
209#rulerLeft { 209#rulerLeft {
210 // TODO: temporary background please replace when component is implemented 210 // TODO: temporary background please replace when component is implemented
211 background: url("../images/temp/ruler-left.png"); 211 background:$color-stage;
212 width:16px; 212 width:16px;
213} 213}
214 214
@@ -291,11 +291,6 @@
291 overflow-y:hidden; 291 overflow-y:hidden;
292} 292}
293 293
294.contextMenu {
295 position:absolute;
296 z-index:999;
297}
298
299#openDocumentsTabComponent { 294#openDocumentsTabComponent {
300 height: 25px; 295 height: 25px;
301 position: relative; 296 position: relative;
@@ -336,3 +331,9 @@
336 overflow: hidden; 331 overflow: hidden;
337 color: white; 332 color: white;
338} 333}
334
335.montage-popup-modal-mask
336{
337 opacity: 1;
338 background: -webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%);
339} \ No newline at end of file
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..6e728863
--- /dev/null
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -0,0 +1,23 @@
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}
20
21.montage-invisible {
22 display: none;
23} \ No newline at end of file
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index ccac99ca..bccea6fc 100644..100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -98,7 +98,7 @@
98} 98}
99 99
100#timelinePanel { 100#timelinePanel {
101 height: 116px; 101 height: 100%;
102} 102}
103 103
104// Only used by Animation Presets Panel currently 104// Only used by Animation Presets Panel currently
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 7b7db576..587903d2 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,3 +192,16 @@
192 overflow-x: auto; 192 overflow-x: auto;
193 overflow-y: auto; 193 overflow-y: auto;
194} 194}
195
196.montage-editor-frame {
197 position:absolute;
198 z-index:7;
199 top: 0;
200 left:0;
201 display:none;
202 -webkit-user-select: initial;
203}
204.montage-editor {
205 padding:0px;
206 word-wrap: normal;
207} \ No newline at end of file
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 935c4cd6..19ede70a 100644..100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -12,23 +12,15 @@
12// 12//
13 13
14 14
15// Made changes to toolButton 15// Made changes to toolButton }
16 16
17.toolButton { 17.subToolHolderPanel .toolbutton {
18 width:26px;
19 height:23px;
20 padding: 0px;
21 margin:1px;
22 border-width: 1px;
23 border-style: solid;
24}
25
26.subToolButton {
27 float:left; 18 float:left;
19 -webkit-transform: scale(0.6);
28} 20}
29 21
30#topPanelContainer .subToolButton { 22.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active {
31 23 -webkit-transform: scale(0.75);
32} 24}
33 25
34.subOption{ 26.subOption{
@@ -39,21 +31,6 @@
39 margin-right: 10px; 31 margin-right: 10px;
40} 32}
41 33
42.toolButton:active {
43 border-top-width: 1px;
44 border-top-style: solid;
45 border-left-width: 1px;
46 border-left-style: solid;
47}
48
49.toolButtonSelected {
50 border-top-width: 1px;
51 border-top-style: solid;
52 border-left-width: 1px;