aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
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.scss16
-rwxr-xr-x[-rw-r--r--]scss/imports/scss/_MenuUI.scss0
-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.scss13
-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
19 files changed, 24 insertions, 5 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..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,
@@ -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
@@ -331,3 +331,9 @@
331 overflow: hidden; 331 overflow: hidden;
332 color: white; 332 color: white;
333} 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/_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 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 19ede70a..19ede70a 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 00d8b5f0..00d8b5f0 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