aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-09 14:19:14 -0700
committerJohn Mayhew2012-05-09 14:19:14 -0700
commit7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a (patch)
tree906770258f7d6ef63a73695690c39559930c3b0a
parent0088f8e5f3a0be4b6e5e497afbe34de11211493c (diff)
downloadninja-7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a.tar.gz
Correct layout and styling for the shape tool and its sub tools
Diffstat
-rwxr-xr-xcss/ninja.css2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css19
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html3
-rwxr-xr-xscss/imports/scss/_Tools.scss4
5 files changed, 22 insertions, 8 deletions
diff --git a/css/ninja.css b/css/ninja.css
index d309b34e..a65e826f 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -677,7 +677,7 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
677 677
678nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } 678nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
679 679
680.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); } 680.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; }
681 681
682.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } 682.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
683 683
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 01f2b1da..43dae547 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,6 @@
75 75
76 <body> 76 <body>
77 <div data-montage-id="rectProperties" class="rectProperties"> 77 <div data-montage-id="rectProperties" class="rectProperties">
78 <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>-->
79 <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button> 78 <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button>
80 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 79 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
81 <div data-montage-id="TLRadiusControl" class="label"></div> 80 <div data-montage-id="TLRadiusControl" class="label"></div>
@@ -87,5 +86,4 @@
87 <div data-montage-id="BRRadiusControl" class="label"></div> 86 <div data-montage-id="BRRadiusControl" class="label"></div>
88 </div> 87 </div>
89 </body> 88 </body>
90
91</html> \ No newline at end of file 89</html> \ No newline at end of file
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 1100bc70..4dc64d66 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -5,17 +5,26 @@
5 </copyright> */ 5 </copyright> */
6 6
7 .optionsShapeTool { 7 .optionsShapeTool {
8 padding: 4px; 8 padding: 6px;
9} 9}
10 10
11 .optionsShapeTool > * { 11 .optionsShapeTool > * {
12 float:left; 12 float:left;
13} 13}
14 14
15.optionsShapeTool select.nj-skinned {
16 margin-top: 2px;
17}
18
19.optionsShapeTool .shapeCustomProps {
20 margin-top: -3px;
21 margin-left: -31px;
22}
23
15 .optionsShapeTool .fillColorCtrl, .optionsShapeTool .strokeColorCtrl { 24 .optionsShapeTool .fillColorCtrl, .optionsShapeTool .strokeColorCtrl {
16 width: 20px; 25 width: 20px;
17 height: 18px; 26 height: 18px;
18 margin: 2px 6px; 27 margin: 1px 6px;
19 border: 1px black solid; 28 border: 1px black solid;
20} 29}
21 30
@@ -25,4 +34,8 @@
25 margin-top: 2px; 34 margin-top: 2px;
26 -webkit-transform: scale(0.8); 35 -webkit-transform: scale(0.8);
27 background-color: rgb(40, 40, 40); 36 background-color: rgb(40, 40, 40);
28} \ No newline at end of file 37}
38
39.optionsShapeTool checkbox {
40 padding: 6px;
41}
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 9363365e..c54f8b25 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -136,6 +136,7 @@
136 <div data-montage-id="shapeToolsList"> 136 <div data-montage-id="shapeToolsList">
137 <div data-montage-id="toolbutton"></div> 137 <div data-montage-id="toolbutton"></div>
138 </div> 138 </div>
139 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
139 <div class="colorCtrlIcon PencilTool"></div> 140 <div class="colorCtrlIcon PencilTool"></div>
140 <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> 141 <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div>
141 <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div> 142 <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div>
@@ -143,7 +144,7 @@
143 <div class="nj-divider divider-vertical">&nbsp;</div> 144 <div class="nj-divider divider-vertical">&nbsp;</div>
144 <label class="label">Stroke:</label> 145 <label class="label">Stroke:</label>
145 <div data-montage-id="strokeControl" class="label"></div> 146 <div data-montage-id="strokeControl" class="label"></div>
146 <div id="customProperties"> 147 <div id="customProperties" class="shapeCustomProps">
147 <div data-montage-id="ovalProperties" class="label"></div> 148 <div data-montage-id="ovalProperties" class="label"></div>
148 <div data-montage-id="rectProperties" class="label"></div> 149 <div data-montage-id="rectProperties" class="label"></div>
149 <div data-montage-id="lineProperties" class="label"></div> 150 <div data-montage-id="lineProperties" class="label"></div>
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 57519043..637828a4 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -17,6 +17,7 @@
17.subToolHolderPanel .toolbutton { 17.subToolHolderPanel .toolbutton {
18 float:left; 18 float:left;
19 -webkit-transform: scale(0.6); 19 -webkit-transform: scale(0.6);
20 margin-top: -4px;
20} 21}
21 22
22.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { 23.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active {
@@ -27,6 +28,7 @@
27 margin-right: 9px; 28 margin-right: 9px;
28} 29}
29 30
31/* These appear to be unused
30.toolSeparator { 32.toolSeparator {
31 height:1px; 33 height:1px;
32 width:30px; 34 width:30px;
@@ -61,10 +63,10 @@
61 opacity: 1.0; 63 opacity: 1.0;
62 } 64 }
63 65
64
65.drawingMode { 66.drawingMode {
66 outline:blue solid thin; 67 outline:blue solid thin;
67} 68}
69*/
68 70
69 71
70// Added new styling Sub Tool Shape Options 72// Added new styling Sub Tool Shape Options
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:04:08 +0000