aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-15 14:23:19 -0800
committerArmen Kesablyan2012-02-15 14:23:19 -0800
commitbb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b (patch)
treecae6abe170b5ac861747dcd6db5a7c19ab34858c /scss/imports
parentace16ef22b3ff32663504df7720af481d76987d6 (diff)
downloadninja-bb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b.tar.gz
Tool Icons : New layout
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'scss/imports')
-rw-r--r--scss/imports/scss/_Tools.scss24
-rw-r--r--scss/imports/scss/_toolbar.scss328
2 files changed, 139 insertions, 213 deletions
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 935c4cd6..bf425666 100644
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -14,15 +14,6 @@
14 14
15// Made changes to toolButton 15// Made changes to toolButton
16 16
17.toolButton {
18 width:26px;
19 height:23px;
20 padding: 0px;
21 margin:1px;
22 border-width: 1px;
23 border-style: solid;
24}
25
26.subToolButton { 17.subToolButton {
27 float:left; 18 float:left;
28} 19}
@@ -39,21 +30,6 @@
39 margin-right: 10px; 30 margin-right: 10px;
40} 31}
41 32
42.toolButton:active {
43 border-top-width: 1px;
44 border-top-style: solid;
45 border-left-width: 1px;
46 border-left-style: solid;
47}
48
49.toolButtonSelected {
50 border-top-width: 1px;
51 border-top-style: solid;
52 border-left-width: 1px;
53 border-left-style: solid;
54
55}
56
57.toolSeparator { 33.toolSeparator {
58 height:1px; 34 height:1px;
59 width:30px; 35 width:30px;
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 048c1f88..44178b24 100644
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -11,280 +11,230 @@
11// _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss 11// _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
12 12
13 13
14// New Tool List CSS 14// New Tool List CSS
15.SelectionToolPressed { 15#toolsPanelContent {
16 @include background-pos(12,1,26px,23px); 16 width:40px;
17 @include opacity(1.0);
18} 17}
19 18
20.SelectionToolUnpressed { 19.toolsList {
21 @include background-pos(13,1,26px,23px); 20 width:30px;
22 @include opacity(0.7); 21 margin:auto;
23} 22}
24 23
25.SubselectionToolPressed { 24.toolsList hr {
26 @include background-pos(14,1,26px,23px); 25 border:0px;
27 @include opacity(1.0); 26 border-top: 1px solid #232323;
27 border-bottom: 1px solid #3A3A3A;
28 margin:2px;
28} 29}
29 30
30.SubselectionToolUnpressed { 31.toolbutton {
31 @include background-pos(15,1,26px,23px); 32 width:30px;
32 @include opacity(0.7); 33 height:30px;
33} 34 background-position: center center;
34 35 background-repeat: no-repeat;
35.RotateTool3DPressed { 36 -webkit-border-radius:4px;
36 @include background-pos(0,0,26px,23px); 37 opacity: 0.6;
37 @include opacity(1.0); 38 margin-bottom: 2px;
38} 39}
39 40
40.RotateTool3DUnpressed { 41.toolsList .toolbutton:hover, .toolsList .active {
41 @include background-pos(1,0,26px,23px); 42 box-shadow: inset 0px 0px 8px #999;
42 @include opacity(0.7); 43 opacity: 1;
43} 44}
44 45
45.Translate3DPressed { 46.toolsList .active {
46 @include background-pos(4,0,26px,23px); 47 background-color:#555;
47 @include opacity(1.0);
48} 48}
49 49
50.Translate3DUnpressed { 50.SelectionTool {
51 @include background-pos(5,0,26px,23px); 51 background-image:url("../images/tools/Tool-Selection.png");
52 @include opacity(0.7);
53} 52}
54 53
55.TagToolPressed { 54.SubselectionTool {
56 @include background-pos(0,2,26px,23px); 55 background-image:url("../images/tools/Tool-Subselect.png");
57 @include opacity(1.0);
58} 56}
59 57
60.TagToolUnpressed { 58.RotateTool3D {
61 @include background-pos(1,2,26px,23px); 59 background-image:url("../images/tools/Tool-3DRotate.png");
62 @include opacity(0.7);
63} 60}
64 61
65.PenToolPressed { 62.Translate3D {
66 @include background-pos(6,1,26px,23px); 63 background-image:url("../images/tools/Tool-3DTranslate.png");
67 @include opacity(1.0);
68} 64}
69 65
70.PenToolUnpressed { 66.TagTool {
71 @include background-pos(7,1,26px,23px); 67 background-image:url("../images/tools/Tool-Tag.png");
72 @include opacity(0.7);
73} 68}
74 69
75.TextToolPressed { 70.PenTool {
76 @include background-pos(2,2,26px,23px); 71 background-image:url("../images/tools/Tool-Pen.png");
77 @include opacity(1.0);
78} 72}
79 73
80.TextToolUnpressed { 74.TextTool {
81 @include background-pos(3,2,26px,23px); 75 background-image:url("../images/tools/Tool-Text.png");
82 @include opacity(0.7);
83} 76}
84 77
85.ShapeContainerPressed { 78.ShapeContainer {
86 @include background-pos(4,1,26px,23px); 79 background-image:url("../images/tools/Tool-Rectangle.png");
87 @include opacity(1.0);
88}
89.ShapeContainerUnpressed {
90 @include background-pos(5,1,26px,23px);
91 @include opacity(0.7);
92} 80}
93 81
94.OvalToolPressed { 82.OvalTool {
95 @include background-pos(4,1,26px,23px); 83 background-image:url("../images/tools/Tool-Oval.png");
96 @include opacity(1.0);
97} 84}
98 85
99.OvalToolUnpressed { 86.RectangleTool {
100 @include background-pos(5,1,26px,23px); 87 background-image:url("../images/tools/Tool-Rectangle.png");
101 @include opacity(0.7);
102} 88}
103 89
104.RectangleToolPressed { 90.LineTool {
105 @include background-pos(10,1,26px,23px); 91 background-image:url("../images/tools/Tool-Stroke.png");
106 @include opacity(1.0);
107} 92}
108 93
109.RectangleToolUnpressed { 94.PencilTool {
110 @include background-pos(11,1,26px,23px); 95 background-image:url("../images/tools/Tool-Pencil.png");
111 @include opacity(0.7);
112} 96}
113 97
114.LineToolPressed { 98.BrushTool {
115 @include background-pos(2,1,26px,23px); 99 background-image:url("../images/tools/Tool-PaintBrush.png");
116 @include opacity(1.0);
117} 100}
118 101
119.LineToolUnpressed { 102.FillTool {
120 @include background-pos(3,1,26px,23px); 103 background-image:url("../images/tools/Tool-Fill.png");
121 @include opacity(0.7);
122} 104}
123 105
124.PencilToolPressed { 106.EyedropperTool {
125 @include background-pos(8,1,26px,23px); 107 background-image:url("../images/tools/Tool-EyeDropper.png");
126 @include opacity(1.0);
127} 108}
128 109
129.PencilToolUnpressed { 110.EraserTool {
130 @include background-pos(9,1,26px,23px); 111 background-image:url("../images/tools/Tool-Erase.png");
131 @include opacity(0.7);
132} 112}
133 113
134.BrushToolPressed { 114.RotateStageTool3D {
135 @include background-pos(8,0,26px,23px); 115 background-image:url("../images/tools/Tool-3DRotateStage.png");
136 @include opacity(1.0);
137} 116}
138 117
139.BrushToolUnpressed { 118.TranslateStageTool3D {
140 @include background-pos(9,0,26px,23px); 119 background-image:url("../images/tools/Tool-3DTranslateStage.png");
141 @include opacity(0.7);
142} 120}