aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-15 10:42:41 -0700
committerJohn Mayhew2012-05-15 10:42:41 -0700
commit035c851a955952d0a1c89a7c8a646b674ab3f4f2 (patch)
treec1197e37c93fc56f28b36139c86559a3c49b5bdb
parent52f63541065ce94fab8766b1b0db057eafcfccaa (diff)
downloadninja-035c851a955952d0a1c89a7c8a646b674ab3f4f2.tar.gz
-fixed spacing problem in the tag tool
-implemented the new mode radio buttons for the pen tool
Diffstat
-rwxr-xr-xcss/ninja.css6
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.css6
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html14
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html2
-rwxr-xr-xscss/imports/scss/_Tools.scss14
5 files changed, 33 insertions, 9 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 6b3c00d6..33ec332c 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -823,6 +823,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
823 823
824.distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); } 824.distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); }
825 825
826.optionsPenTool input.penToolIcon { background-image: url("../images/tools/Tool-Pen.png"); }
827
828.optionsPenTool input.penPlusToolIcon { background-image: url("../images/optionsbar/pen/penPlus.png"); }
829
830.optionsPenTool input.penMinusToolIcon { background-image: url("../images/optionsbar/pen/penMinus.png"); }
831
826#toolsPanelContent { width: 40px; } 832#toolsPanelContent { width: 40px; }
827 833
828.toolsList { width: 29px; margin: auto; } 834.toolsList { width: 29px; margin: auto; }
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css
index c6e68195..7f1b0f7f 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.css
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css
@@ -4,9 +4,3 @@
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 .optionsPenTool {
8}
9
10 .optionsPenTool > * {
11 float:left;
12}
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 324d1070..e720eb84 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -28,18 +28,28 @@
28 "prototype": "js/components/tools-properties/pen-properties.reel", 28 "prototype": "js/components/tools-properties/pen-properties.reel",
29 "properties": { 29 "properties": {
30 "element": {"#": "penProperties"}, 30 "element": {"#": "penProperties"},
31
32 "_penToolRadio": {"#": "penTool"},
33 "_penPlusRadio": {"#": "penPlus"},
34 "_penMinusRadio": {"#": "penMinus"},
35
31 "_fillColorCtrl": {"#": "fillColorCtrl"}, 36 "_fillColorCtrl": {"#": "fillColorCtrl"},
32 "_strokeColorCtrl": {"#": "strokeColorCtrl"}, 37 "_strokeColorCtrl": {"#": "strokeColorCtrl"},
33 "_strokeSize": {"@": "strokeSizeHT"} 38 "_strokeSize": {"@": "strokeSizeHT"}
34 } 39 }
35 } 40 }
36 } 41 }
37 </script> 42 </script>
38 43
39 </head> 44 </head>
40 45
41 <body> 46 <body>
42 <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> 47 <div data-montage-id="penProperties" class="subToolHolderPanel toolOptionsFloatChildren optionsPenTool">
48 <input type="radio" data-montage-id="penTool" class="toolOptsRadioButton penToolIcon" title="Pen Tool" name="penSubtoolRadios" value="pen" checked/>
49 <input type="radio" data-montage-id="penPlus" class="toolOptsRadioButton penPlusToolIcon" title="Pen Plus" name="penSubtoolRadios" value="penPlus"/>
50 <input type="radio" data-montage-id="penMinus" class="toolOptsRadioButton penMinusToolIcon toolOptionsSpacer" title="Pen Minus" name="penSubtoolRadios" value="penMinus"/>
51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
52
43 <div class="toolColorChipIcon PencilTool"></div> 53 <div class="toolColorChipIcon PencilTool"></div>
44 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 54 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
45 <div class="toolColorChipIcon FillTool"></div> 55 <div class="toolColorChipIcon FillTool"></div>
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 7a8f6d87..87f87aff 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -45,7 +45,7 @@
45 <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/> 45 <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/>
46 <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/> 46 <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/>
47 47
48 <div class="nj-divider divider-vertical">&nbsp;</div> 48 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
49 49
50 <div class="toolColorChipIcon FillTool"></div> 50 <div class="toolColorChipIcon FillTool"></div>
51 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 51 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index a4deb488..d068fd2e 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -458,3 +458,17 @@ input[type="radio"]:disabled {
458 background-image: url("../images/optionsbar/selection/DistRight.png"); 458 background-image: url("../images/optionsbar/selection/DistRight.png");
459} 459}
460 460
461.optionsPenTool {
462}
463
464.optionsPenTool input.penToolIcon {
465 background-image:url("../images/tools/Tool-Pen.png");
466}
467
468.optionsPenTool input.penPlusToolIcon {
469 background-image:url("../images/optionsbar/pen/penPlus.png");
470}
471
472.optionsPenTool input.penMinusToolIcon {
473 background-image:url("../images/optionsbar/pen/penMinus.png");
474}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:46:10 +0000