diff options
author | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
commit | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch) | |
tree | f0f6168b083aa929d34f37edca6c87ce7c3743bd /scss/imports/scss/_toolbar.scss | |
parent | 0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'scss/imports/scss/_toolbar.scss')
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 124 |
1 files changed, 1 insertions, 123 deletions
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index e4bf64bf..9440fa85 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss | |||
@@ -53,7 +53,7 @@ | |||
53 | } | 53 | } |
54 | 54 | ||
55 | .toolbutton.active { | 55 | .toolbutton.active { |
56 | box-shadow: inset 0px 0px 2px 2px #555; | 56 | box-shadow: inset 0px 0px 2px 2px #999; |
57 | background-color:#363636; | 57 | background-color:#363636; |
58 | } | 58 | } |
59 | 59 | ||
@@ -61,10 +61,6 @@ | |||
61 | background-image:url("../images/tools/Tool-Selection.png"); | 61 | background-image:url("../images/tools/Tool-Selection.png"); |
62 | } | 62 | } |
63 | 63 | ||
64 | .SubselectionTool { | ||
65 | background-image:url("../images/tools/Tool-Subselect.png"); | ||
66 | } | ||
67 | |||
68 | .RotateTool3D { | 64 | .RotateTool3D { |
69 | background-image:url("../images/tools/Tool-3DRotate.png"); | 65 | background-image:url("../images/tools/Tool-3DRotate.png"); |
70 | } | 66 | } |
@@ -113,10 +109,6 @@ | |||
113 | background-image:url("../images/tools/Tool-Fill.png"); | 109 | background-image:url("../images/tools/Tool-Fill.png"); |
114 | } | 110 | } |
115 | 111 | ||
116 | .EyedropperTool { | ||
117 | background-image:url("../images/tools/Tool-EyeDropper.png"); | ||
118 | } | ||
119 | |||
120 | .EraserTool { | 112 | .EraserTool { |
121 | background-image:url("../images/tools/Tool-Erase.png"); | 113 | background-image:url("../images/tools/Tool-Erase.png"); |
122 | } | 114 | } |
@@ -141,117 +133,3 @@ | |||
141 | background-image:url("../images/tools/Tool-FillColor.png"); | 133 | background-image:url("../images/tools/Tool-FillColor.png"); |
142 | } | 134 | } |
143 | 135 | ||
144 | .toolsList .colortoolbar { | ||
145 | padding-left: 1px; | ||
146 | padding-top:4px; | ||
147 | } | ||
148 | |||
149 | .toolsList .colortoolbar button | ||
150 | { | ||
151 | width: 27px; | ||
152 | height: 27px; | ||
153 | background: black; | ||
154 | border: 1px solid #000; | ||
155 | padding: 0; | ||
156 | margin: 0px; | ||
157 | } | ||
158 | |||
159 | .toolsList .colortoolbar div | ||
160 | { | ||
161 | width: 27px; | ||
162 | height: 27px; | ||
163 | margin: 0; | ||
164 | margin-top:3px; | ||
165 | } | ||
166 | |||
167 | .toolsList .colortoolbar div.cpe_colortoolbar_container | ||
168 | { | ||
169 | margin: 0; | ||
170 | } | ||
171 | |||
172 | |||
173 | |||
174 | /*.InkBottleToolPressed {*/ | ||
175 | /*background-image: url("../images/tools/inkbottle_down.png");*/ | ||
176 | /*background-repeat: no-repeat;*/ | ||
177 | /*height: 23px;*/ | ||
178 | /*width: 26px;*/ | ||
179 | /*opacity: 1;*/ | ||
180 | /*}*/ | ||
181 | |||
182 | /*.InkBottleToolUnpressed {*/ | ||
183 | /*background-image: url("../images/tools/inkbottle_down.png");*/ | ||
184 | /*background-repeat: no-repeat;*/ | ||
185 | /*height: 23px;*/ | ||
186 | /*width: 26px;*/ | ||
187 | /*opacity: 0.7;*/ | ||
188 | /*}*/ | ||
189 | |||
190 | // Selection Tool Options | ||
191 | .topAlignUp { | ||
192 | |||
193 | @include background-pos(8,2,26px,23px); | ||
194 | } | ||
195 | |||
196 | .rightAlignUp { | ||
197 | |||
198 | @include background-pos(9,2,26px,23px); | ||
199 | } | ||
200 | |||
201 | .bottomAlignUp { | ||
202 | |||
203 | @include background-pos(10,2,26px,23px); | ||
204 | } | ||
205 | |||
206 | .verticalLeftUp { | ||
207 | |||
208 | @include background-pos(11,2,26px,23px); | ||
209 | } | ||
210 | |||
211 | .verticalCenterUp { | ||
212 | |||
213 | @include background-pos(12,2,26px,23px); | ||
214 | } | ||
215 | |||
216 | .verticalRightUp { | ||
217 | |||
218 | @include background-pos(13,2,26px,23px); | ||
219 | } | ||
220 | |||
221 | .distRightUp { | ||
222 | |||
223 | @include background-pos(0,3,26px,23px); | ||
224 | } | ||
225 | |||
226 | .distLeftUp { | ||
227 | |||
228 | @include background-pos(14,2,26px,23px); | ||
229 | } | ||
230 | |||
231 | .distCenterUp { | ||
232 | |||
233 | @include background-pos(2,3,26px,23px); | ||
234 | } | ||
235 | |||
236 | .distTopUp { | ||
237 | |||
238 | @include background-pos(1,3,26px,23px); | ||
239 | } | ||
240 | |||
241 | .distBottomUp { | ||
242 | |||
243 | @include background-pos(3,3,26px,23px); | ||
244 | } | ||
245 | |||
246 | .distVCenterUp { | ||
247 | |||
248 | @include background-pos(15,2,26px,23px); | ||
249 | } | ||
250 | |||
251 | .bucketToolUp { | ||
252 | @include background-pos(11,0,26px,23px); | ||
253 | } | ||
254 | |||
255 | .pencilToolUp { | ||
256 | @include background-pos(9,1,26px,23px); | ||
257 | } | ||