aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-21 14:36:32 -0700
committerArmen Kesablyan2012-06-21 14:36:32 -0700
commitd9f9a65226dfe26500e82061cc38a7dda302f720 (patch)
tree32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /scss/imports
parent1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff)
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
downloadninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'scss/imports')
-rwxr-xr-xscss/imports/scss/_Tools.scss12
1 files changed, 10 insertions, 2 deletions
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index c63e695d..e599668f 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -36,12 +36,20 @@
36} 36}
37 37
38.toolColorChipCtrl { 38.toolColorChipCtrl {
39 width: 18px; 39 width: 16px;
40 height: 16px;
41 border: 1px #000 solid;
42}
43
44.toolColorChipContainer
45{
46 background: url(../../../../../images/colorpanel/transparent.png) repeat;
47 width: 18px;
40 height: 18px; 48 height: 18px;
41 margin-top: 1px; 49 margin-top: 1px;
42 margin-left: 3px; 50 margin-left: 3px;
43 margin-right: 8px; 51 margin-right: 8px;
44 border: 1px black solid; 52 border: 1px #777 solid;
45} 53}
46 54
47.toolColorChipIcon { 55.toolColorChipIcon {