aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorKruti Shah2012-06-22 10:00:53 -0700
committerKruti Shah2012-06-22 10:00:53 -0700
commit4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (patch)
tree743ea0d3a3af9cae65d5af531a6dba1951b03b33 /scss
parentcb9fbfeba90b5b76d3f3f2b9303129ca4651e5be (diff)
parent020ad879a627c4234a8732f05e175ad69cedf180 (diff)
downloadninja-4bf8e4cdc179c3b388fc06f26008808aa4b77eb0.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'scss')
-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 {