From 92873714dd6ffb259e6c5a27da2ade773d7b00f9 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Wed, 15 Feb 2012 15:04:37 -0800
Subject: New Icons: Last set had imperfections

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../_MontageOverrides.scssc                         | Bin 2665 -> 2814 bytes
 .../_toolbar.scssc                                  | Bin 15338 -> 15676 bytes
 scss/compass_app_log.txt                            |  17 +++++++++++++++++
 scss/imports/scss/_MontageOverrides.scss            |   4 ++++
 scss/imports/scss/_toolbar.scss                     |   8 ++++++++
 5 files changed, 29 insertions(+)

(limited to 'scss')

diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
index 02e1f256..ae35faa4 100644
Binary files a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc and b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc differ
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
index d5541090..6fc7c8bd 100644
Binary files a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc and b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc 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 @@
 2012-02-15 13:48:27 overwrite ../css/ninja.css
 2012-02-15 13:49:27 overwrite ../css/ninja.css
 2012-02-15 13:49:35 identical ../css/ninja.css
+2012-02-15 14:37:00     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:37:00 overwrite ../css/ninja.css
+2012-02-15 14:44:12     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:44:12 identical ../css/ninja.css
+2012-02-15 14:44:15     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:44:15 identical ../css/ninja.css
+2012-02-15 14:44:34     error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
+2012-02-15 14:44:34 identical ../css/ninja.css
+2012-02-15 14:44:57 overwrite ../css/ninja.css
+2012-02-15 14:45:37 overwrite ../css/ninja.css
+2012-02-15 14:52:43 overwrite ../css/ninja.css
+2012-02-15 14:52:57 overwrite ../css/ninja.css
+2012-02-15 14:53:28 overwrite ../css/ninja.css
+2012-02-15 14:53:42 overwrite ../css/ninja.css
+2012-02-15 14:54:10 overwrite ../css/ninja.css
+2012-02-15 14:55:22 identical ../css/ninja.css
+2012-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 @@
 }
 .montage-popup-container {
     background: none;
+}
+
+.montage-invisible {
+    display: none;
 }
\ 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 @@
     background-image:url("../images/tools/Tool-FillColor.png");
 }
 
+.toolsList .colortoolbar {
+    padding-left: 1px;
+    padding-top:4px;
+}
+
 .toolsList .colortoolbar button
 {
 	width: 27px;
@@ -146,6 +151,7 @@
 	width: 27px;
 	height: 27px;
 	margin: 0;
+   margin-top:3px;
 }
 
 .toolsList .colortoolbar div.cpe_colortoolbar_container
@@ -153,6 +159,8 @@
 	margin: 0;
 }
 
+
+
 /*.InkBottleToolPressed {*/
     /*background-image: url("../images/tools/inkbottle_down.png");*/
     /*background-repeat: no-repeat;*/
-- 
cgit v1.2.3