aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-16 10:33:18 -0800
committerArmen Kesablyan2012-02-16 10:33:18 -0800
commited18ea232174cceaa95b57315a4f993ea4d6c6ec (patch)
treed721084d8fe01a6cc773be0829d2222362ebdc5d
parent92873714dd6ffb259e6c5a27da2ade773d7b00f9 (diff)
downloadninja-ed18ea232174cceaa95b57315a4f993ea4d6c6ec.tar.gz
Tool Icons
Signed-off-by: Armen Kesablyan <armen@motorola.com>
-rw-r--r--css/ninja.css10
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scsscbin15676 -> 16843 bytes
-rw-r--r--scss/imports/scss/_toolbar.scss23
3 files changed, 22 insertions, 11 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 62642787..179a67da 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -808,15 +808,17 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
808 808
809#toolsPanelContent { width: 40px; } 809#toolsPanelContent { width: 40px; }
810 810
811.toolsList { width: 30px; margin: auto; } 811.toolsList { width: 29px; margin: auto; }
812 812
813.toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; } 813.toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; }
814 814
815.toolbutton { width: 30px; height: 30px; background-position: center center; background-repeat: no-repeat; -webkit-border-radius: 4px; opacity: 0.6; margin-bottom: 2px; } 815.toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); -webkit-transition: 0.15s all cubic-bezier(0.44, 0.19, 0, 0.99); }
816 816
817.toolsList .toolbutton:hover, .toolsList .active { box-shadow: inset 0px 0px 8px #999; opacity: 1; } 817.toolsList .toolbutton:hover, .toolsList .active { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); opacity: 1; }
818 818
819.toolsList .active { background-color: #555; } 819.toolsList .toolbutton:active { background-color: #8c8c8c; }
820
821.toolsList .active { box-shadow: inset 0px 0px 2px 2px #555; background-color: #363636; }
820 822
821.SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); } 823.SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); }
822 824
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
index 6fc7c8bd..91213519 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
Binary files differ
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 4d460bad..429fe427 100644
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -17,7 +17,7 @@
17} 17}
18 18
19.toolsList { 19.toolsList {
20 width:30px; 20 width:29px;
21 margin:auto; 21 margin:auto;
22} 22}
23 23
@@ -29,22 +29,31 @@
29} 29}
30 30
31.toolbutton { 31.toolbutton {
32 width:30px; 32 width:29px;
33 height:30px; 33 height:29px;
34 background-position: center center; 34 background-position: center center;
35 background-repeat: no-repeat; 35 background-repeat: no-repeat;
36 -webkit-border-radius:4px; 36 border-radius:3px;
37 opacity: 0.6; 37 opacity: 1;
38 margin-bottom: 2px; 38 margin-bottom: 2px;
39 -webkit-transform: scale(0.8);
40 -webkit-transition: 0.15s all cubic-bezier(.44,.19,0,.99);
39} 41}
40 42
41.toolsList .toolbutton:hover, .toolsList .active { 43.toolsList .toolbutton:hover, .toolsList .active {
42 box-shadow: inset 0px 0px 8px #999; 44 box-shadow: 0px 0px 2px 2px #999;
45
46 -webkit-transform: scale(1);
43 opacity: 1; 47 opacity: 1;
44} 48}
45 49
50.toolsList .toolbutton:active {
51 background-color: #8c8c8c;
52}
53
46.toolsList .active { 54.toolsList .active {
47 background-color:#555; 55 box-shadow: inset 0px 0px 2px 2px #555;
56 background-color:#363636;
48} 57}
49 58
50.SelectionTool { 59.SelectionTool {