aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css4
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html4
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html4
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html2
-rwxr-xr-xjs/panels/properties.reel/properties.css10
-rwxr-xr-xscss/imports/scss/_Tools.scss12
11 files changed, 33 insertions, 15 deletions
diff --git a/css/ninja.css b/css/ninja.css
index e3d560ab..1a6bd654 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -677,7 +677,9 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
677 677
678.toolOptionsSpacer { margin-right: 9px; } 678.toolOptionsSpacer { margin-right: 9px; }
679 679
680.toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } 680.toolColorChipCtrl { width: 16px; height: 16px; border: 1px #000 solid; }
681
682.toolColorChipContainer { background: url(../../../../../images/colorpanel/transparent.png) repeat; width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px #777 solid; }
681 683
682.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } 684.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; }
683 685
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 7d99a42a..8753e921 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -82,7 +82,7 @@
82 <body> 82 <body>
83 <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> 83 <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
84 <div class="toolColorChipIcon FillTool"></div> 84 <div class="toolColorChipIcon FillTool"></div>
85 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 85 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
86 <div class="nj-divider divider-vertical">&nbsp;</div> 86 <div class="nj-divider divider-vertical">&nbsp;</div>
87 <label class="label"> Width:</label> 87 <label class="label"> Width:</label>
88 <div data-montage-id="strokeSize" class="label"></div> 88 <div data-montage-id="strokeSize" class="label"></div>
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index ca447b8b..a479dbda 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -66,7 +66,7 @@
66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> 66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/> 67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/>
68 <div class="toolColorChipIcon FillTool"></div> 68 <div class="toolColorChipIcon FillTool"></div>
69 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 69 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
70 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 70 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
71 71
72 <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/> 72 <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 5620eed8..41c55bc0 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -151,7 +151,7 @@
151 151
152 <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/> 152 <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/>
153 <div class="toolColorChipIcon PencilTool"></div> 153 <div class="toolColorChipIcon PencilTool"></div>
154 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 154 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
155 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 155 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
156 156
157 <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> 157 <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/>
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 adb5cd7d..c77ac660 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -51,9 +51,9 @@
51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
52 52
53 <div class="toolColorChipIcon PencilTool"></div> 53 <div class="toolColorChipIcon PencilTool"></div>
54 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 54 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
55 <div class="toolColorChipIcon FillTool"></div> 55 <div class="toolColorChipIcon FillTool"></div>
56 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 56 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
57 <div class="nj-divider divider-vertical">&nbsp;</div> 57 <div class="nj-divider divider-vertical">&nbsp;</div>
58 <label class="label"> Stroke:</label> 58 <label class="label"> Stroke:</label>
59 <div data-montage-id="strokeSize" class="label"></div> 59 <div data-montage-id="strokeSize" class="label"></div>
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 ea246ea8..22ea7431 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -135,9 +135,9 @@
135 </div> 135 </div>
136 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 136 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
137 <div class="toolColorChipIcon PencilTool"></div> 137 <div class="toolColorChipIcon PencilTool"></div>
138 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 138 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
139 <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> 139 <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div>
140 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 140 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
141 <div class="nj-divider divider-vertical">&nbsp;</div> 141 <div class="nj-divider divider-vertical">&nbsp;</div>
142 <label class="label">Stroke:</label> 142 <label class="label">Stroke:</label>
143 <div data-montage-id="strokeControl" class="label"></div> 143 <div data-montage-id="strokeControl" class="label"></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 87f87aff..082384db 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -48,7 +48,7 @@
48 <div class="nj-divider divider-vertical toolOptionsSpacer">&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 class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
52 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 52 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
53 53
54 <div id="classNameContainer"> 54 <div id="classNameContainer">
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 218105a7..586cdcd5 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -39,7 +39,7 @@
39 width: 160px; 39 width: 160px;
40} 40}
41 41
42.optionsTextTool .toolColorChipCtrl { 42.fontColorChipContainer {
43 margin-left: 6px; 43 margin-left: 10px !important;
44 margin-right: 0px; 44 margin-right: 0px;
45} \ No newline at end of file 45} \ No newline at end of file
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index e7fafd0d..f47ca0c8 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -290,7 +290,7 @@
290 <button data-montage-id="fontSettings" style="display: none"></button> 290 <button data-montage-id="fontSettings" style="display: none"></button>
291 <label class="label">Size:</label> 291 <label class="label">Size:</label>
292 <select data-montage-id="fontSize" class="nj-skinned"></select> 292 <select data-montage-id="fontSize" class="nj-skinned"></select>
293 <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> 293 <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div>
294 <div class="btnGroup toolOptionsFloatChildren"> 294 <div class="btnGroup toolOptionsFloatChildren">
295 <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> 295 <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button>
296 <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> 296 <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button>
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 84f52ed4..d1aa750a 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -239,8 +239,9 @@ padding-right:6px;
239} 239}
240 240
241.propertiesPanel .colortoolbar div { 241.propertiesPanel .colortoolbar div {
242 margin: 0px 10px 0px 20px; 242 margin: 0px 5px 0px 10px;
243 clear:none; 243 clear:none;
244 float: left;
244} 245}
245 246
246/* color select */ 247/* color select */
@@ -250,6 +251,13 @@ padding-right:6px;
250 clear:none; 251 clear:none;
251} 252}
252 253
254.propertiesPanel .colortoolbar .chipContainer {
255 margin-top: 2px;
256 background: url(../../../../../images/colorpanel/transparent.png) repeat;
257 width: 40px;
258 height: 20px;
259}
260
253.propertiesPanel .button:active { 261.propertiesPanel .button:active {
254 outline: none; 262 outline: none;
255} 263}
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index c63e695d..e599668f 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -36,12 +36,20 @@
36} 36}
37 37
38.toolColorChipCtrl { 38.toolColorChipCtrl {
39 width: 18px; 39 width: 16px;
40 height: 16px;
41 border: 1px #000 solid;
42}
43
44.toolColorChipContainer
45{