aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css48
-rw-r--r--images/optionsbar/pen/penMinus.pngbin0 -> 392 bytes
-rw-r--r--images/optionsbar/pen/penPlus.pngbin0 -> 403 bytes
-rw-r--r--images/optionsbar/tag/canvas-tag.pngbin0 -> 1529 bytes
-rw-r--r--images/optionsbar/tag/custom-tag.pngbin0 -> 738 bytes
-rw-r--r--images/optionsbar/tag/div-tag.pngbin0 -> 637 bytes
-rw-r--r--images/optionsbar/tag/img-tag.pngbin0 -> 715 bytes
-rw-r--r--images/optionsbar/tag/vid-tag.pngbin0 -> 389 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_minus.pngbin3102 -> 648 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_plus.pngbin3103 -> 691 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-tag.pngbin6403 -> 0 bytes
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html12
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
-rwxr-xr-xscss/imports/scss/_Tools.scss138
14 files changed, 70 insertions, 134 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 309c3ccd..34a29362 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -679,6 +679,14 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
679 679
680.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } 680.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; }
681 681
682.subToolHolderPanel input.toolOptsRadioButton { background: none; width: 20px; height: 20px; display: block; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background-position: 1px 1px; }
683
684.subToolHolderPanel input.toolOptsRadioButton:active { border: 1px solid transparent; }
685
686.subToolHolderPanel input.toolOptsRadioButton:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; }
687
688.subToolHolderPanel input.toolOptsRadioButton:checked { background-color: #b2b2b2; opacity: 1.0; cursor: default; -webkit-box-shadow: none; background-repeat: no-repeat; background-position: 1px 1px; }
689
682.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } 690.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; }
683 691
684.selectBox { width: 10em; opacity: 0.9; margin-left: 10px; float: left; display: block; background-color: #666666; border: 1px solid black; color: white; outline: none; } 692.selectBox { width: 10em; opacity: 0.9; margin-left: 10px; float: left; display: block; background-color: #666666; border: 1px solid black; color: white; outline: none; }
@@ -743,35 +751,15 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
743 751
744.optionLabel { margin-top: 5px; } 752.optionLabel { margin-top: 5px; }
745 753
746.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } 754.tagRadioButtons input.divTool { background-image: url("../images/optionsbar/tag/div-tag.png"); }
747
748.tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); }
749
750.tagRadioButtons input.tag-type:active { border: 1px solid transparent; }
751
752.tagRadioButtons input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; }
753
754.tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; }
755
756.tagRadioButtons input.divTool { margin-left: 8px; background-position: -40px 0px; }
757 755
758.tagRadioButtons input.divTool:checked { background-position: -40px -20px; } 756.tagRadioButtons input.imageTool { background-image: url("../images/optionsbar/tag/img-tag.png"); }
759 757
760.tagRadioButtons input.imageTool { background-position: -60px 0px; } 758.tagRadioButtons input.videoTool { background-image: url("../images/optionsbar/tag/vid-tag.png"); }
761 759
762.tagRadioButtons input.imageTool:checked { background-position: -60px -20px; } 760.tagRadioButtons input.canvasTool { background-image: url("../images/optionsbar/tag/canvas-tag.png"); }
763 761
764.tagRadioButtons input.videoTool { background-position: -100px 0px; } 762.tagRadioButtons input.customTool { background-image: url("../images/optionsbar/tag/custom-tag.png"); }
765
766.tagRadioButtons input.videoTool:checked { background-position: -100px -20px; }
767
768.tagRadioButtons input.canvasTool { background-position: -20px 0px; }
769
770.tagRadioButtons input.canvasTool:checked { background-position: -20px -20px; }
771
772.tagRadioButtons input.customTool { background-position: 0px 0px; }
773
774.tagRadioButtons input.customTool:checked { background-position: 0px -20px; }
775 763
776.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; } 764.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; }
777 765
@@ -779,15 +767,9 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
779 767
780.tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } 768.tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; }
781 769
782#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; } 770#zoomToolOptionHolder .zoomOutToolIcon { background-image: url("../images/optionsbar/zoom/zoom_minus.png"); }
783
784#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; }
785
786#zoomToolOptionHolder input#zoomInTool { border-style: solid; border-width: 1px; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; }
787
788#zoomToolOptionHolder input#zoomOutTool { border-style: solid; border-width: 1px; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; }
789 771
790#zoomToolOptionHolder input.zoom-option { background: none; } 772#zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); }
791 773
792.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } 774.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; }
793 775
diff --git a/images/optionsbar/pen/penMinus.png b/images/optionsbar/pen/penMinus.png
new file mode 100644
index 00000000..eac4a742
--- /dev/null
+++ b/images/optionsbar/pen/penMinus.png
Binary files differ
diff --git a/images/optionsbar/pen/penPlus.png b/images/optionsbar/pen/penPlus.png
new file mode 100644
index 00000000..e7dd565f
--- /dev/null
+++ b/images/optionsbar/pen/penPlus.png
Binary files differ
diff --git a/images/optionsbar/tag/canvas-tag.png b/images/optionsbar/tag/canvas-tag.png
new file mode 100644
index 00000000..daf6036e
--- /dev/null
+++ b/images/optionsbar/tag/canvas-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/custom-tag.png b/images/optionsbar/tag/custom-tag.png
new file mode 100644
index 00000000..98c560ad
--- /dev/null
+++ b/images/optionsbar/tag/custom-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/div-tag.png b/images/optionsbar/tag/div-tag.png
new file mode 100644
index 00000000..2a2bac2e
--- /dev/null
+++ b/images/optionsbar/tag/div-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/img-tag.png b/images/optionsbar/tag/img-tag.png
new file mode 100644
index 00000000..7a1c6e79
--- /dev/null
+++ b/images/optionsbar/tag/img-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/vid-tag.png b/images/optionsbar/tag/vid-tag.png
new file mode 100644
index 00000000..e72bac5a
--- /dev/null
+++ b/images/optionsbar/tag/vid-tag.png
Binary files differ
diff --git a/images/optionsbar/zoom/zoom_minus.png b/images/optionsbar/zoom/zoom_minus.png
index 666cc85c..530c89d5 100755
--- a/images/optionsbar/zoom/zoom_minus.png
+++ b/images/optionsbar/zoom/zoom_minus.png
Binary files differ
diff --git a/images/optionsbar/zoom/zoom_plus.png b/images/optionsbar/zoom/zoom_plus.png
index 005dc969..de47235c 100755
--- a/images/optionsbar/zoom/zoom_plus.png
+++ b/images/optionsbar/zoom/zoom_plus.png
Binary files differ
diff --git a/images/tools/sprite-toolbar-tag.png b/images/tools/sprite-toolbar-tag.png
deleted file mode 100755
index 69b13ec3..00000000
--- a/images/tools/sprite-toolbar-tag.png
+++ /dev/null
Binary files differ
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 f92665a7..e9c15d22 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -41,13 +41,13 @@
41 <div data-montage-id="tagToolContainer" class="tagRadioButtons toolOptionsFloatChildren"> 41 <div data-montage-id="tagToolContainer" class="tagRadioButtons toolOptionsFloatChildren">
42 <div class="toolColorChipIcon FillTool"></div> 42 <div class="toolColorChipIcon FillTool"></div>
43 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 43 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
44 <div class="nj-divider divider-vertical">&nbsp;</div> 44 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
45 45
46 <input type="radio" data-montage-id="divTool" class="tag-type divTool" title="Div Element" name="TagRadios" checked/> 46 <input type="radio" data-montage-id="divTool" class="toolOptsRadioButton divTool" title="Div Element" name="TagRadios" checked/>
47 <input type="radio" data-montage-id="imageTool" class="tag-type imageTool" title="Image Element" name="TagRadios"/> 47 <input type="radio" data-montage-id="imageTool" class="toolOptsRadioButton imageTool" title="Image Element" name="TagRadios"/>
48 <input type="radio" data-montage-id="videoTool" class="tag-type videoTool" title="Video Element" name="TagRadios"/> 48 <input type="radio" data-montage-id="videoTool" class="toolOptsRadioButton videoTool" title="Video Element" name="TagRadios"/>
49 <input type="radio" data-montage-id="canvasTool" class="tag-type canvasTool" title="Canvas Element" name="TagRadios"/> 49 <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios"/>
50 <input type="radio" data-montage-id="customTool" class="tag-type customTool" title="Custom Element" name="TagRadios"/> 50 <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton 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/js/components/tools-properties/zoom-properties.reel/zoom-properties.html b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
index cf22b775..7a830f2a 100755
--- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
+++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
@@ -27,9 +27,9 @@
27 27
28 <body> 28 <body>
29 <div data-montage-id="zoomProperties" class="subToolHolderPanel"> 29 <div data-montage-id="zoomProperties" class="subToolHolderPanel">
30 <div id="zoomToolOptionHolder" class="subToolButton"> 30 <div id="zoomToolOptionHolder" class="toolOptionsFloatChildren">
31 <input data-montage-id="zoomInTool" id="zoomInTool" type="radio" name="zoomRadio" class="zoom-option" title="Zoom In"checked/> 31 <input data-montage-id="zoomInTool" id="zoomInTool" type="radio" name="zoomRadio" class="toolOptsRadioButton zoomInToolIcon" title="Zoom In"checked/>
32 <input data-montage-id="zoomOutTool" id="zoomOutTool" type="radio" name="zoomRadio" title="Zoom Out" class="zoom-option"/> 32 <input data-montage-id="zoomOutTool" id="zoomOutTool" type="radio" name="zoomRadio" class="toolOptsRadioButton zoomOutToolIcon" title="Zoom Out"/>
33 </div> 33 </div>
34 </div> 34 </div>
35 </body> 35 </body>
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