diff options
| author | John Mayhew | 2012-05-07 14:30:47 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 14:30:47 -0700 |
| commit | 29ad6355ef60cfb3b3fc7f780504f3ed30845883 (patch) | |
| tree | bbe2dcd46c98db8138ad0a8f0263ef33324d7669 /js/components/tools-properties/pen-properties.reel | |
| parent | 1a759361b82127f9d5c1428dc889fffdf2daaf86 (diff) | |
| download | ninja-29ad6355ef60cfb3b3fc7f780504f3ed30845883.tar.gz | |
More implementation of moving color chips to the individual subtools.
Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.css | 8 | ||||
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 5 |
2 files changed, 8 insertions, 5 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 01a0ca1f..d08d0abd 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.css +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css | |||
| @@ -4,7 +4,6 @@ | |||
| 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 | |||
| 8 | .optionsPenTool { | 7 | .optionsPenTool { |
| 9 | padding: 6px; | 8 | padding: 6px; |
| 10 | } | 9 | } |
| @@ -16,11 +15,14 @@ | |||
| 16 | .optionsPenTool .fillColorCtrl, .optionsPenTool .strokeColorCtrl { | 15 | .optionsPenTool .fillColorCtrl, .optionsPenTool .strokeColorCtrl { |
| 17 | width: 20px; | 16 | width: 20px; |
| 18 | height: 18px; | 17 | height: 18px; |
| 19 | margin: 2px 6px; | 18 | margin-left: 3px; |
| 19 | margin-right: 8px; | ||
| 20 | border: 1px black solid; | ||
| 20 | } | 21 | } |
| 21 | 22 | ||
| 22 | .optionsPenTool .colorCtrlIcon { | 23 | .optionsPenTool .colorCtrlIcon { |
| 23 | width: 20px; | 24 | width: 20px; |
| 24 | height: 20px; | 25 | height: 20px; |
| 25 | background-color: rgb(54, 54, 54); | 26 | -webkit-transform: scale(0.8); |
| 27 | background-color: rgb(40, 40, 40); | ||
| 26 | } \ No newline at end of file | 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 176663df..9bae188e 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,11 @@ | |||
| 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 FillTool"></div> | ||
| 44 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | ||
| 45 | <div class="colorCtrlIcon PencilTool"></div> | 43 | <div class="colorCtrlIcon PencilTool"></div> |
| 46 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> | 44 | <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div> |
| 45 | <div class="colorCtrlIcon FillTool"></div> | ||
| 46 | <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> | ||
| 47 | <div class="nj-divider divider-vertical"> </div> | ||
| 47 | <label class="label"> Stroke:</label> | 48 | <label class="label"> Stroke:</label> |
| 48 | <div id="strokeSize" class="label"></div> | 49 | <div id="strokeSize" class="label"></div> |
| 49 | </div> | 50 | </div> |