diff options
Diffstat (limited to 'js')
3 files changed, 18 insertions, 6 deletions
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"> </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"> </div> | 144 | <div class="nj-divider divider-vertical"> </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> |