aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
Diffstat (limited to 'scss')
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scsscbin2665 -> 2814 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scsscbin15338 -> 15676 bytes
-rw-r--r--scss/compass_app_log.txt17
-rw-r--r--scss/imports/scss/_MontageOverrides.scss4
-rw-r--r--scss/imports/scss/_toolbar.scss8
5 files changed, 29 insertions, 0 deletions
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
index 02e1f256..ae35faa4 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
Binary files differ
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
index d5541090..6fc7c8bd 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
Binary files differ
diff --git a/scss/compass_app_log.txt b/scss/compass_app_log.txt
index ad936de7..c4795cdf 100644
--- a/scss/compass_app_log.txt
+++ b/scss/compass_app_log.txt
@@ -14,3 +14,20 @@
142012-02-15 13:48:27 overwrite ../css/ninja.css 142012-02-15 13:48:27 overwrite ../css/ninja.css
152012-02-15 13:49:27 overwrite ../css/ninja.css 152012-02-15 13:49:27 overwrite ../css/ninja.css
162012-02-15 13:49:35 identical ../css/ninja.css 162012-02-15 13:49:35 identical ../css/ninja.css
172012-02-15 14:37:00 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
182012-02-15 14:37:00 overwrite ../css/ninja.css
192012-02-15 14:44:12 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
202012-02-15 14:44:12 identical ../css/ninja.css
212012-02-15 14:44:15 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
222012-02-15 14:44:15 identical ../css/ninja.css
232012-02-15 14:44:34 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
242012-02-15 14:44:34 identical ../css/ninja.css
252012-02-15 14:44:57 overwrite ../css/ninja.css
262012-02-15 14:45:37 overwrite ../css/ninja.css
272012-02-15 14:52:43 overwrite ../css/ninja.css
282012-02-15 14:52:57 overwrite ../css/ninja.css
292012-02-15 14:53:28 overwrite ../css/ninja.css
302012-02-15 14:53:42 overwrite ../css/ninja.css
312012-02-15 14:54:10 overwrite ../css/ninja.css
322012-02-15 14:55:22 identical ../css/ninja.css
332012-02-15 14:55:28 overwrite ../css/ninja.css
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss
index 65b9ede0..6e728863 100644
--- a/scss/imports/scss/_MontageOverrides.scss
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -16,4 +16,8 @@
16} 16}
17.montage-popup-container { 17.montage-popup-container {
18 background: none; 18 background: none;
19}
20
21.montage-invisible {
22 display: none;
19} \ No newline at end of file 23} \ No newline at end of file
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 44178b24..4d460bad 100644
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -131,6 +131,11 @@
131 background-image:url("../images/tools/Tool-FillColor.png"); 131 background-image:url("../images/tools/Tool-FillColor.png");
132} 132}
133 133
134.toolsList .colortoolbar {
135 padding-left: 1px;
136 padding-top:4px;
137}
138
134.toolsList .colortoolbar button 139.toolsList .colortoolbar button
135{ 140{
136 width: 27px; 141 width: 27px;
@@ -146,6 +151,7 @@
146 width: 27px; 151 width: 27px;
147 height: 27px; 152 height: 27px;
148 margin: 0; 153 margin: 0;
154 margin-top:3px;
149} 155}
150 156
151.toolsList .colortoolbar div.cpe_colortoolbar_container 157.toolsList .colortoolbar div.cpe_colortoolbar_container
@@ -153,6 +159,8 @@
153 margin: 0; 159 margin: 0;
154} 160}
155 161
162
163
156/*.InkBottleToolPressed {*/ 164/*.InkBottleToolPressed {*/
157 /*background-image: url("../images/tools/inkbottle_down.png");*/ 165 /*background-image: url("../images/tools/inkbottle_down.png");*/
158 /*background-repeat: no-repeat;*/ 166 /*background-repeat: no-repeat;*/