aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-10 11:17:42 -0700
committerJohn Mayhew2012-05-10 11:17:42 -0700
commit3be15e2076f2d3d46862bbc0ea078b9bf2e161fe (patch)
tree7043c476e0852197f67f00b1d1c583736d492797 /js/components
parent18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (diff)
downloadninja-3be15e2076f2d3d46862bbc0ea078b9bf2e161fe.tar.gz
-moved sel tool images to proper folder
-finished styling shape tool options -added new icons for shape tool
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css4
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css9
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html10
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js2
7 files changed, 32 insertions, 12 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css
index 7f1b0f7f..ea0d92fc 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.css
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -4,3 +4,14 @@
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 6
7.ovalProperties{
8}
9
10.ovalProperties hottextunit {
11 width: 22px;
12}
13
14.ovalProperties label {
15 margin-left: 6px;
16 margin-right: 6px;
17}
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index c76e8c39..21308be6 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -35,9 +35,9 @@
35 </head> 35 </head>
36 36
37 <body> 37 <body>
38 <div data-montage-id="ovalProperties"> 38 <div data-montage-id="ovalProperties" class="ovalProperties toolOptionsFloatChildren">
39 <label class="label">Inner Radius:</label> 39 <label>Inner Radius:</label>
40 <div data-montage-id="innerRadiusControl" class="label"></div> 40 <div data-montage-id="innerRadiusControl"></div>
41 </div> 41 </div>
42 </body> 42 </body>
43 43
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index c186d895..dcb478e7 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -12,7 +12,9 @@
12 opacity: 0.7; 12 opacity: 0.7;
13 width: 17px; 13 width: 17px;
14 height: 18px; 14 height: 18px;
15 margin-right: 10px; 15 margin-right: 8px;
16 margin-left: 8px;
17 margin-top: 1px;
16} 18}
17 19
18.rectProperties .subToolButton { 20.rectProperties .subToolButton {
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index 6caef4b3..42746caa 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -75,7 +75,7 @@
75 75
76 <body> 76 <body>
77 <div data-montage-id="rectProperties" class="rectProperties toolOptionsFloatChildren"> 77 <div data-montage-id="rectProperties" class="rectProperties toolOptionsFloatChildren">
78 <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button> 78 <button data-montage-id="lockButton" id="lockButton" class="unlock"></button>
79 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 79 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
80 <div data-montage-id="TLRadiusControl" class=""></div> 80 <div data-montage-id="TLRadiusControl" class=""></div>
81 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> 81 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div>
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index c1f8a8ce..70a0e780 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -9,10 +9,15 @@
9} 9}
10 10
11.optionsShapeTool .shapeCustomProps { 11.optionsShapeTool .shapeCustomProps {
12 margin-top: -3px; 12 margin-top: 0px;
13 margin-left: -31px; 13 margin-left: -7px;
14} 14}
15 15
16.optionsShapeTool checkbox { 16.optionsShapeTool checkbox {
17 padding: 6px; 17 padding: 6px;
18 margin-left: 4px;
18} 19}
20
21.optionsShapeTool .hottextunit {
22 /*width: 46px;*/
23} \ No newline at end of file
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index c6aa0c94..9b523a3f 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -118,6 +118,8 @@
118 "rectProperties": {"@": "rectProperties1"}, 118 "rectProperties": {"@": "rectProperties1"},
119 "lineProperties": {"@": "lineProperties1"}, 119 "lineProperties": {"@": "lineProperties1"},
120 120
121 "endDivider": {"#": "endDivider"},
122
121 "components": [ 123 "components": [
122 {"@": "repetition1"} 124 {"@": "repetition1"}
123 ] 125 ]
@@ -144,14 +146,14 @@
144 <div class="nj-divider divider-vertical">&nbsp;</div> 146 <div class="nj-divider divider-vertical">&nbsp;</div>
145 <label class="label">Stroke:</label> 147 <label class="label">Stroke:</label>
146 <div data-montage-id="strokeControl" class="label"></div> 148 <div data-montage-id="strokeControl" class="label"></div>
149 <div class="nj-divider divider-vertical">&nbsp;</div>
147 <div id="customProperties" class="shapeCustomProps"> 150 <div id="customProperties" class="shapeCustomProps">
148 <div data-montage-id="ovalProperties" class="label"></div> 151 <div data-montage-id="ovalProperties" class="label"></div>
149 <div data-montage-id="rectProperties" class="label"></div> 152 <div data-montage-id="rectProperties" class="label"></div>
150 <div data-montage-id="lineProperties" class="label"></div> 153 <div data-montage-id="lineProperties" class="label"></div>
151 </div> 154 </div>
152 155 <div data-montage-id="endDivider" class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
153 <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> 156 <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label>
154
155 <label data-montage-id="materialLabel" class="label">Material:</label> 157 <label data-montage-id="materialLabel" class="label">Material:</label>
156 <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div> 158 <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div>
157 159
@@ -160,9 +162,7 @@
160 162
161 <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> 163 <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div>
162 <select class="selectBox" data-montage-id="fillMaterialCB"> 164 <select class="selectBox" data-montage-id="fillMaterialCB">
163 </select> 165 </select>
164
165
166 </div> 166 </div>
167 </body> 167 </body>
168 168
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 23158493..bd0cf8cf 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -112,11 +112,13 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
112 this._fillColorCtrl.visible = false; 112 this._fillColorCtrl.visible = false;
113 this._fillColorCtrlIcon.style["display"] = "none"; 113 this._fillColorCtrlIcon.style["display"] = "none";
114 this._fillColorCtrlIcon.visible = false; 114 this._fillColorCtrlIcon.visible = false;
115 this.endDivider.style["display"] = "none";
115 } else { 116 } else {
116 this._fillColorCtrl.style["display"] = ""; 117 this._fillColorCtrl.style["display"] = "";
117 this._fillColorCtrl.visible = true; 118 this._fillColorCtrl.visible = true;
118 this._fillColorCtrlIcon.style["display"] = ""; 119 this._fillColorCtrlIcon.style["display"] = "";
119 this._fillColorCtrlIcon.visible = true; 120 this._fillColorCtrlIcon.visible = true;
121 this.endDivider.style["display"] = "";
120 } 122 }
121 123
122 if (this._useWebGL.checked) { 124 if (this._useWebGL.checked) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 02:11:39 +0000