aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-14 12:41:47 -0700
committerJohn Mayhew2012-05-14 12:41:47 -0700
commit2cdefe05cdc058160093d7ab9d50a4fadd1c45fc (patch)
tree502f325916b3afe8bc05d849b5f00151ea2c08d1 /scss
parentec886fe3c46f6e3e54fe4e1df769dabed5588063 (diff)
downloadninja-2cdefe05cdc058160093d7ab9d50a4fadd1c45fc.tar.gz
-updated images for tag and zoom tool
-made tag and zoom tool radio group button styles consistent and removed duplicate classes
Diffstat (limited to 'scss')
-rwxr-xr-xscss/imports/scss/_Tools.scss138
1 files changed, 46 insertions, 92 deletions
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index c2d2498a..1813fb14 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -31,11 +31,6 @@
31 float:left; 31 float:left;
32} 32}
33 33
34// .toolOptionsFloatChildren select.nj-skinned {
35// margin-top: 2px;
36// }
37
38
39.toolOptionsSpacer { 34.toolOptionsSpacer {
40 margin-right: 9px; 35 margin-right: 9px;
41} 36}
@@ -57,6 +52,45 @@
57 background-color: rgb(40, 40, 40); 52 background-color: rgb(40, 40, 40);
58} 53}
59 54
55// generic styles for image radio button groups used in the tool options bar
56.subToolHolderPanel input.toolOptsRadioButton {
57 background: none;
58 width: 20px;
59 height: 20px;
60 display: block;
61 margin: 0px;
62 padding: 0px;
63 margin-right: 5px;
64 margin-top: 0px;
65 background-repeat: no-repeat;
66 opacity: 0.8;
67 text-indent: -9999px;
68 cursor: pointer;
69 -webkit-border-radius: 3px;
70 -webkit-user-select: none;
71 border: 1px solid transparent;
72 background-position: 1px 1px;
73}
74
75.subToolHolderPanel input.toolOptsRadioButton:active {
76 border: 1px solid transparent;
77}
78
79.subToolHolderPanel input.toolOptsRadioButton:hover {
80 opacity: 1.0;
81 -webkit-box-shadow: 0px 0px 4px #fff;
82}
83
84.subToolHolderPanel input.toolOptsRadioButton:checked {
85 background-color: $color-tool-bg-active;
86 opacity: 1.0;
87 cursor: default;
88 -webkit-box-shadow: none;
89 background-repeat: no-repeat;
90 background-position: 1px 1px;
91}
92
93
60// Added new styling Sub Tool Shape Options 94// Added new styling Sub Tool Shape Options
61.textBox { 95.textBox {
62 96
@@ -270,70 +304,20 @@ input[type="radio"]:disabled {
270} 304}
271 305
272// Begin: styles for tag toolbar 306// Begin: styles for tag toolbar
273.tagRadioButtons input.tag-type {
274 background: none;
275 width: 20px;
276 height: 20px;
277 display: block;
278 float: left;
279 margin: 0px;
280 padding: 0px;
281 margin-right: 5px;
282 margin-top: 0px;
283 background-repeat: no-repeat;
284 opacity: 0.8;
285 text-indent: -9999px;
286 cursor: pointer;
287 -webkit-border-radius: 3px;
288 -webkit-user-select: none;
289 border: 1px solid transparent;
290}
291.tagRadioButtons input.tag-type {
292 background-image: url("../images/tools/sprite-toolbar-tag.png");
293}
294.tagRadioButtons input.tag-type:active {
295 border: 1px solid transparent;
296}
297.tagRadioButtons input.tag-type:hover {
298 opacity: 1.0;
299 -webkit-box-shadow: 0px 0px 4px #fff;
300}
301.tagRadioButtons input.tag-type:checked {
302 background-color: transparent;
303 opacity: 1.0;
304 cursor: default;
305 -webkit-box-shadow: none;
306}
307.tagRadioButtons input.divTool { 307.tagRadioButtons input.divTool {
308 margin-left: 8px; 308 background-image: url("../images/optionsbar/tag/div-tag.png");
309 background-position: -40px 0px;
310}
311.tagRadioButtons input.divTool:checked {
312 background-position: -40px -20px;
313} 309}
314.tagRadioButtons input.imageTool { 310.tagRadioButtons input.imageTool {
315 background-position: -60px 0px; 311 background-image: url("../images/optionsbar/tag/img-tag.png");
316}
317.tagRadioButtons input.imageTool:checked {
318 background-position: -60px -20px;
319} 312}
320.tagRadioButtons input.videoTool { 313.tagRadioButtons input.videoTool {
321 background-position: -100px 0px; 314 background-image: url("../images/optionsbar/tag/vid-tag.png");
322}
323.tagRadioButtons input.videoTool:checked {
324 background-position: -100px -20px;
325} 315}
326.tagRadioButtons input.canvasTool { 316.tagRadioButtons input.canvasTool {
327 background-position: -20px 0px; 317 background-image: url("../images/optionsbar/tag/canvas-tag.png");
328}
329.tagRadioButtons input.canvasTool:checked {
330 background-position: -20px -20px;
331} 318}
332.tagRadioButtons input.customTool { 319.tagRadioButtons input.customTool {
333 background-position: 0px 0px; 320 background-image: url("../images/optionsbar/tag/custom-tag.png");
334}
335.tagRadioButtons input.customTool:checked {
336 background-position: 0px -20px;
337} 321}
338 322
339.tagRadioButtons .nj-divider { 323.tagRadioButtons .nj-divider {
@@ -354,42 +338,12 @@ input[type="radio"]:disabled {
354} 338}
355// End: styles for tag toolbar 339// End: styles for tag toolbar
356 340
357#zoomToolOptionHolder input#zoomInTool:checked{ 341#zoomToolOptionHolder .zoomOutToolIcon {
358 border-style:solid;
359 border-width:1px ;
360 border-color: $color-input;
361 background-image:url("../images/optionsbar/zoom/zoom_plus.png");
362 background-repeat: no-repeat;
363 background-position:4px 3px;
364}
365
366#zoomToolOptionHolder input#zoomOutTool:checked{
367 border-style:solid;
368 border-width:1px ;
369 border-color: $color-input;
370 background-image:url("../images/optionsbar/zoom/zoom_minus.png"); 342 background-image:url("../images/optionsbar/zoom/zoom_minus.png");
371 background-repeat: no-repeat;
372 background-position:4px 3px;
373} 343}
374 344
375#zoomToolOptionHolder input#zoomInTool{ 345#zoomToolOptionHolder .zoomInToolIcon {
376 border-style:solid;
377 border-width:1px ;
378 background-image:url("../images/optionsbar/zoom/zoom_plus.png"); 346 background-image:url("../images/optionsbar/zoom/zoom_plus.png");
379 background-repeat: no-repeat;
380 background-position:4px 3px;
381}
382
383#zoomToolOptionHolder input#zoomOutTool{
384 border-style:solid;
385 border-width:1px ;
386 background-image:url("../images/optionsbar/zoom/zoom_minus.png");
387 background-repeat: no-repeat;
388 background-position:4px 3px;
389
390}
391#zoomToolOptionHolder input.zoom-option {
392 background:none;
393} 347}
394 348
395// object 3D container styles 349// object 3D container styles