diff options
-rwxr-xr-x | css/ninja.css | 6 | ||||
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.css | 17 | ||||
-rwxr-xr-x | scss/imports/scss/_Tools.scss | 25 |
3 files changed, 24 insertions, 24 deletions
diff --git a/css/ninja.css b/css/ninja.css index 9740317d..24600b49 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -773,7 +773,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
773 | 773 | ||
774 | .tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } | 774 | .tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } |
775 | 775 | ||
776 | .tagRadioButtons input.divTool { background-position: -40px 0px; } | 776 | .tagRadioButtons input.divTool { margin-left: 8px; background-position: -40px 0px; } |
777 | 777 | ||
778 | .tagRadioButtons input.divTool:checked { background-position: -40px -20px; } | 778 | .tagRadioButtons input.divTool:checked { background-position: -40px -20px; } |
779 | 779 | ||
@@ -799,6 +799,10 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
799 | 799 | ||
800 | .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } | 800 | .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } |
801 | 801 | ||
802 | .tagRadioButtons .fillColorCtrl { width: 18px; height: 18px; margin-top: 6px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } | ||
803 | |||
804 | .tagRadioButtons .colorCtrlIcon { width: 20px; height: 20px; margin-top: 6px; -webkit-transform: scale(0.8); background-color: #282828; } | ||
805 | |||
802 | #zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } | 806 | #zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } |
803 | 807 | ||
804 | #zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } | 808 | #zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } |
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.css b/js/components/tools-properties/tag-properties.reel/tag-properties.css index 7969dff9..018448f1 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.css +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.css | |||
@@ -3,20 +3,3 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | |||
7 | .tagRadioButtons .fillColorCtrl { | ||
8 | width: 18px; | ||
9 | height: 18px; | ||
10 | margin-top: 6px; | ||
11 | margin-left: 3px; | ||
12 | margin-right: 8px; | ||
13 | border: 1px black solid; | ||
14 | } | ||
15 | |||
16 | .tagRadioButtons .colorCtrlIcon { | ||
17 | width: 20px; | ||
18 | height: 20px; | ||
19 | margin-top: 6px; | ||
20 | -webkit-transform: scale(0.8); | ||
21 | background-color: rgb(40, 40, 40); | ||
22 | } \ No newline at end of file | ||
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index fd75e189..9f0489b4 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss | |||
@@ -323,6 +323,7 @@ input[type="radio"]:disabled { | |||
323 | -webkit-box-shadow: none; | 323 | -webkit-box-shadow: none; |
324 | } | 324 | } |
325 | .tagRadioButtons input.divTool { | 325 | .tagRadioButtons input.divTool { |
326 | margin-left: 8px; | ||
326 | background-position: -40px 0px; | 327 | background-position: -40px 0px; |
327 | } | 328 | } |
328 | .tagRadioButtons input.divTool:checked { | 329 | .tagRadioButtons input.divTool:checked { |
@@ -370,6 +371,24 @@ input[type="radio"]:disabled { | |||
370 | visibility: hidden; | 371 | visibility: hidden; |
371 | } | 372 | } |
372 | 373 | ||
374 | .tagRadioButtons .fillColorCtrl { | ||
375 | width: 18px; | ||
376 | height: 18px; | ||
377 | margin-top: 6px; | ||
378 | margin-left: 3px; | ||
379 | margin-right: 8px; | ||
380 | border: 1px black solid; | ||
381 | } | ||
382 | |||
383 | .tagRadioButtons .colorCtrlIcon { | ||
384 | width: 20px; | ||
385 | height: 20px; | ||
386 | margin-top: 6px; | ||
387 | -webkit-transform: scale(0.8); | ||
388 | background-color: rgb(40, 40, 40); | ||
389 | } | ||
390 | // End: styles for tag toolbar | ||
391 | |||
373 | #zoomToolOptionHolder input#zoomInTool:checked{ | 392 | #zoomToolOptionHolder input#zoomInTool:checked{ |
374 | border-style:solid; | 393 | border-style:solid; |
375 | border-width:1px ; | 394 | border-width:1px ; |
@@ -377,7 +396,6 @@ input[type="radio"]:disabled { | |||
377 | background-image:url("../images/optionsbar/zoom/zoom_plus.png"); | 396 | background-image:url("../images/optionsbar/zoom/zoom_plus.png"); |
378 | background-repeat: no-repeat; | 397 | background-repeat: no-repeat; |
379 | background-position:4px 3px; | 398 | background-position:4px 3px; |
380 | |||
381 | } | 399 | } |
382 | 400 | ||
383 | #zoomToolOptionHolder input#zoomOutTool:checked{ | 401 | #zoomToolOptionHolder input#zoomOutTool:checked{ |
@@ -387,8 +405,6 @@ input[type="radio"]:disabled { | |||
387 | background-image:url("../images/optionsbar/zoom/zoom_minus.png"); | 405 | background-image:url("../images/optionsbar/zoom/zoom_minus.png"); |
388 | background-repeat: no-repeat; | 406 | background-repeat: no-repeat; |
389 | background-position:4px 3px; | 407 | background-position:4px 3px; |
390 | |||
391 | |||
392 | } | 408 | } |
393 | 409 | ||
394 | #zoomToolOptionHolder input#zoomInTool{ | 410 | #zoomToolOptionHolder input#zoomInTool{ |
@@ -397,7 +413,6 @@ input[type="radio"]:disabled { | |||
397 | background-image:url("../images/optionsbar/zoom/zoom_plus.png"); | 413 | background-image:url("../images/optionsbar/zoom/zoom_plus.png"); |
398 | background-repeat: no-repeat; | 414 | background-repeat: no-repeat; |
399 | background-position:4px 3px; | 415 | background-position:4px 3px; |
400 | |||
401 | } | 416 | } |
402 | 417 | ||
403 | #zoomToolOptionHolder input#zoomOutTool{ | 418 | #zoomToolOptionHolder input#zoomOutTool{ |
@@ -410,9 +425,7 @@ input[type="radio"]:disabled { | |||
410 | } | 425 | } |
411 | #zoomToolOptionHolder input.zoom-option { | 426 | #zoomToolOptionHolder input.zoom-option { |
412 | background:none; | 427 | background:none; |
413 | |||
414 | } | 428 | } |
415 | // End: styles for tag toolbar | ||
416 | 429 | ||
417 | // object 3D container styles | 430 | // object 3D container styles |
418 | .object3DToolContainer input.tag-type { | 431 | .object3DToolContainer input.tag-type { |