aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css62
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html12
-rwxr-xr-xscss/imports/scss/_Tools.scss117
4 files changed, 112 insertions, 85 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 2acfcb5d..9740317d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -763,49 +763,41 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
763 763
764.optionLabel { margin-top: 5px; } 764.optionLabel { margin-top: 5px; }
765 765
766#tagToolContainer input.tag-type, #rotateObjectToolContainer input.tag-type, #translateObjectToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } 766.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; }
767 767
768#tagToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } 768.tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); }
769 769
770#rotateObjectToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } 770.tagRadioButtons input.tag-type:active { border: 1px solid transparent; }
771 771
772#translateObjectToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } 772.tagRadioButtons input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; }
773 773
774#tagToolContainer input.tag-type:active, #rotateObjectToolContainer input.tag-type:active, #translateObjectToolContainer input.tag-type:active { border: 1px solid transparent; } 774.tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; }
775 775
776#tagToolContainer input.tag-type:hover, #rotateObjectToolContainer input.tag-type:hover, #translateObjectToolContainer input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } 776.tagRadioButtons input.divTool { background-position: -40px 0px; }
777 777
778#tagToolContainer input.tag-type:checked, #rotateObjectToolContainer input.tag-type:checked, #translateObjectToolContainer input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } 778.tagRadioButtons input.divTool:checked { background-position: -40px -20px; }
779 779
780#tagToolContainer input#divTool { background-position: -40px 0px; } 780.tagRadioButtons input.imageTool { background-position: -60px 0px; }
781 781
782#tagToolContainer input#divTool:checked { background-position: -40px -20px; } 782.tagRadioButtons input.imageTool:checked { background-position: -60px -20px; }
783 783
784#tagToolContainer input#imageTool { background-position: -60px 0px; } 784.tagRadioButtons input.videoTool { background-position: -100px 0px; }
785 785
786#tagToolContainer input#imageTool:checked { background-position: -60px -20px; } 786.tagRadioButtons input.videoTool:checked { background-position: -100px -20px; }
787 787
788#tagToolContainer input#videoTool { background-position: -100px 0px; } 788.tagRadioButtons input.canvasTool { background-position: -20px 0px; }
789 789
790#tagToolContainer input#videoTool:checked { background-position: -100px -20px; } 790.tagRadioButtons input.canvasTool:checked { background-position: -20px -20px; }
791 791
792#tagToolContainer input#canvasTool, #rotateObjectToolContainer input#rotateLocally, #translateObjectToolContainer input#translateLocally { background-position: -20px 0px; } 792.tagRadioButtons input.customTool { background-position: 0px 0px; }
793 793
794#tagToolContainer input#canvasTool:checked, #rotateObjectToolContainer input#rotateLocally:checked, #translateObjectToolContainer input#translateLocally:checked { background-position: -20px -20px; } 794.tagRadioButtons input.customTool:checked { background-position: 0px -20px; }
795 795
796#tagToolContainer input#flashTool { background-position: -80px 0px; } 796.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; top: 5px; }
797 797
798#tagToolContainer input#flashTool:checked { background-position: -80px -20px; } 798.tagRadioButtons select.nj-skinned { visibility: visible; position: relative; }
799 799
800#tagToolContainer input#customTool, #rotateObjectToolContainer input#rotateGlobally, #translateObjectToolContainer input#translateGlobally { background-position: 0px 0px; } 800.tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; }
801
802#tagToolContainer input#customTool:checked, #rotateObjectToolContainer input#rotateGlobally:checked, #translateObjectToolContainer input#translateGlobally:checked { background-position: 0px -20px; }
803
804#tagToolContainer .nj-divider { height: 100%; float: left; position: relative; top: 5px; }
805
806#tagToolContainer select.nj-skinned { visibility: visible; position: relative; }
807
808#tagToolContainer select[disabled="true"].nj-skinned, #tagToolContainer select[disabled].nj-skinned { visibility: hidden; }
809 801
810#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; } 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; }
811 803
@@ -817,6 +809,24 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
817 809
818#zoomToolOptionHolder input.zoom-option { background: none; } 810#zoomToolOptionHolder input.zoom-option { background: none; }
819 811
812.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; }
813
814.object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); }
815
816.object3DToolContainer input.tag-type:active { border: 1px solid transparent; }
817
818.object3DToolContainer input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; }
819
820.object3DToolContainer input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; }
821
822.object3DToolContainer input.rotateLocally { background-position: -20px 0px; }
823
824.object3DToolContainer input.rotateLocally:checked { background-position: -20px -20px; }
825
826.object3DToolContainer input.rotateGlobally { background-position: 0px 0px; }
827
828.object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; }
829
820#toolsPanelContent { width: 40px; } 830#toolsPanelContent { width: 40px; }
821 831
822.toolsList { width: 29px; margin: auto; } 832.toolsList { width: 29px; margin: auto; }
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 1c9505a0..17bafacd 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -30,9 +30,9 @@
30 30
31 <body> 31 <body>
32 <div data-montage-id="object3DProperties" class="subToolHolderPanel"> 32 <div data-montage-id="object3DProperties" class="subToolHolderPanel">
33 <div id="rotateObjectToolContainer" class="tagRadioButtons"> 33 <div class="tagRadioButtons object3DToolContainer">
34 <input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/> 34 <input type="radio" data-montage-id="rotateLocally" class="tag-type rotateLocally" title="Rotate Locally" name="rotateObject" checked/>
35 <input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/> 35 <input type="radio" data-montage-id="rotateGlobally" class="tag-type rotateGlobally" title="Rotate Globally" name="rotateObject"/>
36 </div> 36 </div>
37 </div> 37 </div>
38 </body> 38 </body>
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index 9dbef6f6..bd4590ce 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -38,16 +38,16 @@
38 38
39 <body> 39 <body>
40 <div data-montage-id="tagProperties" class="subToolHolderPanel"> 40 <div data-montage-id="tagProperties" class="subToolHolderPanel">
41 <div id="tagToolContainer" class="tagRadioButtons"> 41 <div data-montage-id="tagToolContainer" class="tagRadioButtons">
42 <div class="leftLabel colorCtrlIcon FillTool"></div> 42 <div class="leftLabel colorCtrlIcon FillTool"></div>
43 <div data-montage-id="fillColorCtrl" class="leftLabel fillColorCtrl"></div> 43 <div data-montage-id="fillColorCtrl" class="leftLabel fillColorCtrl"></div>
44 <div class="nj-divider divider-vertical">&nbsp;</div> 44 <div class="nj-divider divider-vertical">&nbsp;</div>
45 45
46 <input type="radio" data-montage-id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/> 46 <input type="radio" data-montage-id="divTool" class="tag-type divTool" title="Div Element" name="TagRadios" checked/>
47 <input type="radio" data-montage-id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/> 47 <input type="radio" data-montage-id="imageTool" class="tag-type imageTool" title="Image Element" name="TagRadios"/>
48 <input type="radio" data-montage-id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/> 48 <input type="radio" data-montage-id="videoTool" class="tag-type videoTool" title="Video Element" name="TagRadios"/>
49 <input type="radio" data-montage-id="canvasTool" class="tag-type" title="Canvas Element" name="TagRadios"/> 49 <input type="radio" data-montage-id="canvasTool" class="tag-type canvasTool" title="Canvas Element" name="TagRadios"/>
50 <input type="radio" data-montage-id="customTool" class="tag-type" title="Custom Element" name="TagRadios"/> 50 <input type="radio" data-montage-id="customTool" class="tag-type customTool" title="Custom Element" name="TagRadios"/>
51 51
52 <div class="nj-divider divider-vertical">&nbsp;</div> 52 <div class="nj-divider divider-vertical">&nbsp;</div>
53 53
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 00655241..fd75e189 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -288,9 +288,7 @@ input[type="radio"]:disabled {
288} 288}
289 289
290// Begin: styles for tag toolbar 290// Begin: styles for tag toolbar
291#tagToolContainer input.tag-type, 291.tagRadioButtons input.tag-type {
292#rotateObjectToolContainer input.tag-type,
293#translateObjectToolContainer input.tag-type {
294 background: none; 292 background: none;
295 width: 20px; 293 width: 20px;
296 height: 20px; 294 height: 20px;
@@ -308,95 +306,67 @@ input[type="radio"]:disabled {
308 -webkit-user-select: none; 306 -webkit-user-select: none;
309 border: 1px solid transparent; 307 border: 1px solid transparent;
310} 308}
311#tagToolContainer input.tag-type { 309.tagRadioButtons input.tag-type {
312 background-image: url("../images/tools/sprite-toolbar-tag.png"); 310 background-image: url("../images/tools/sprite-toolbar-tag.png");
313} 311}
314#rotateObjectToolContainer input.tag-type { 312.tagRadioButtons input.tag-type:active {
315 background-image: url("../images/tools/sprite-toolbar-3d.png");
316}
317#translateObjectToolContainer input.tag-type {
318 background-image: url("../images/tools/sprite-toolbar-3d.png");
319}
320
321#tagToolContainer input.tag-type:active,
322#rotateObjectToolContainer input.tag-type:active,
323#translateObjectToolContainer input.tag-type:active {
324 border: 1px solid transparent; 313 border: 1px solid transparent;
325} 314}
326#tagToolContainer input.tag-type:hover, 315.tagRadioButtons input.tag-type:hover {
327#rotateObjectToolContainer input.tag-type:hover,
328#translateObjectToolContainer input.tag-type:hover {
329 opacity: 1.0; 316 opacity: 1.0;
330 -webkit-box-shadow: 0px 0px 4px #fff; 317 -webkit-box-shadow: 0px 0px 4px #fff;
331} 318}
332#tagToolContainer input.tag-type:checked, 319.tagRadioButtons input.tag-type:checked {
333#rotateObjectToolContainer input.tag-type:checked,