diff options
| author | John Mayhew | 2012-05-09 18:07:32 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-09 18:07:32 -0700 |
| commit | 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 (patch) | |
| tree | 7c1c75a974dc593f73149770f94c8d746eb4926f /js/components/tools-properties/pen-properties.reel | |
| parent | 7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a (diff) | |
| download | ninja-18370abcf406c6ab36d5c5f2613cb79e756ff6d2.tar.gz | |
-Consolidated many redundant css classes used in the tool options bars
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.css | 16 | ||||
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 8 |
2 files changed, 4 insertions, 20 deletions
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 d08d0abd..c6e68195 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.css +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css | |||
| @@ -5,24 +5,8 @@ | |||
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .optionsPenTool { | 7 | .optionsPenTool { |
| 8 | padding: 6px; | ||
| 9 | } | 8 | } |
| 10 | 9 | ||
| 11 | .optionsPenTool > * { | 10 | .optionsPenTool > * { |
| 12 | float:left; | 11 | float:left; |
| 13 | } | 12 | } |
| 14 | |||
| 15 | .optionsPenTool .fillColorCtrl, .optionsPenTool .strokeColorCtrl { | ||
| 16 | width: 20px; | ||
| 17 | height: 18px; | ||
| 18 | margin-left: 3px; | ||
| 19 | margin-right: 8px; | ||
| 20 | border: 1px black solid; | ||
| 21 | } | ||
| 22 | |||
| 23 | .optionsPenTool .colorCtrlIcon { | ||
| 24 | width: 20px; | ||
| 25 | height: 20px; | ||
| 26 | -webkit-transform: scale(0.8); | ||
| 27 | background-color: rgb(40, 40, 40); | ||
| 28 | } \ No newline at end of file | ||
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 446b0a02..324d1070 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -40,10 +40,10 @@ | |||
| 40 | 40 | ||
| 41 | <body> | 41 | <body> |
| 42 | <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> | 42 | <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool"> |
| 43 | <div class="colorCtrlIcon PencilTool"></div> | 43 | <div class="toolColorChipIcon PencilTool"></div> |
| 44 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | 44 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> |
| 45 | <div class="colorCtrlIcon FillTool"></div> | 45 | <div class="toolColorChipIcon FillTool"></div> |
| 46 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | 46 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> |
| 47 | <div class="nj-divider divider-vertical"> </div> | 47 | <div class="nj-divider divider-vertical"> </div> |
| 48 | <label class="label"> Stroke:</label> | 48 | <label class="label"> Stroke:</label> |
| 49 | <div data-montage-id="strokeSize" class="label"></div> | 49 | <div data-montage-id="strokeSize" class="label"></div> |