aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html12
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js2
3 files changed, 8 insertions, 8 deletions
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 8660bee2..1e34bc9f 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -27,7 +27,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31.optionsShapeTool select.nj-skinned { 31.optionsShapeTool select.nj-skinned {
32 margin-top: 2px; 32 margin-top: 2px;
33} 33}
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 b796b616..774d53a5 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -70,7 +70,7 @@ POSSIBILITY OF SUCH DAMAGE.
70 "value": 1, 70 "value": 1,
71 "decimalPlace": 10, 71 "decimalPlace": 10,
72 "acceptableUnits": ["px", "pt"] 72 "acceptableUnits": ["px", "pt"]
73 73
74 } 74 }
75 }, 75 },
76 76
@@ -147,10 +147,10 @@ POSSIBILITY OF SUCH DAMAGE.
147 } 147 }
148 148
149 } 149 }
150 } 150 }
151 </script> 151 </script>
152
152 153
153
154 </head> 154 </head>
155 155
156 <body> 156 <body>
@@ -182,7 +182,7 @@ POSSIBILITY OF SUCH DAMAGE.
182 182
183 <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div> 183 <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div>
184 <select class="selectBox" data-montage-id="fillMaterialCB"> 184 <select class="selectBox" data-montage-id="fillMaterialCB">
185 </select> 185 </select>
186 </div> 186 </div>
187 </body> 187 </body>
188 188
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 f812f1bf..d10d2870 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -206,7 +206,7 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
206 this._fillColorCtrlContainer.style["display"] = "none"; 206 this._fillColorCtrlContainer.style["display"] = "none";
207 this._fillColorCtrlContainer.visible = false; 207 this._fillColorCtrlContainer.visible = false;
208 this._fillColorCtrlIcon.style["display"] = "none"; 208 this._fillColorCtrlIcon.style["display"] = "none";
209 this._fillColorCtrlIcon.visible = false; 209 this._fillColorCtrlIcon.visible = false;
210 this.endDivider.style["display"] = "none"; 210 this.endDivider.style["display"] = "none";
211 } else { 211 } else {
212 this._fillColorCtrlContainer.style["display"] = ""; 212 this._fillColorCtrlContainer.style["display"] = "";