Adding transparent background to color chip buttons

Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge.
author: Jose Antonio Marquez 2012-06-20 16:45:29 -0700
committer: Jose Antonio Marquez 2012-06-20 16:45:29 -0700
commit: 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (patch)
tree: d3f991a879ae252cbdeb3b88fd9229147367cc9c /js/components/tools-properties
parent: fe569a08853fe986849b6496384d01f3abb65e40 (diff)
download: ninja-7615da5c6ba54bd082eac4b8a6d9196084e5c590.tar.gz
8 files changed, 11 insertions, 11 deletions
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 @@
    <body>
        <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
            <div class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label"> Width:</label>
            <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 @@
        <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
            <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/>
            <div class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
            <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 @@
                <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/>
                <div class="toolColorChipIcon PencilTool"></div>
-                <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+                <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <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 @@
        <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
        <div class="toolColorChipIcon PencilTool"></div>
-        <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+        <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
        <div class="toolColorChipIcon FillTool"></div>
-        <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+        <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
        <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label"> Stroke:</label>
            <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 @@
            </div>
            <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
            <div class="toolColorChipIcon PencilTool"></div>
-            <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
            <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label">Stroke:</label>
            <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 @@
                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <div class="toolColorChipIcon FillTool"></div>
-                <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+                <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <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 @@
    width: 160px;
 }
-.optionsTextTool .toolColorChipCtrl {
+.fontColorChipContainer {
-    margin-left: 6px;
+    margin-left: 10px !important;
    margin-right: 0px;
 }
 \ 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 @@
            <button data-montage-id="fontSettings" style="display: none"></button>
            <label class="label">Size:</label>
            <select data-montage-id="fontSize" class="nj-skinned"></select>
-            <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="btnGroup toolOptionsFloatChildren">
                <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button>
                <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button>
author	Jose Antonio Marquez	2012-06-20 16:45:29 -0700
committer	Jose Antonio Marquez	2012-06-20 16:45:29 -0700
commit	7615da5c6ba54bd082eac4b8a6d9196084e5c590 (patch)
tree	d3f991a879ae252cbdeb3b88fd9229147367cc9c /js/components/tools-properties
parent	fe569a08853fe986849b6496384d01f3abb65e40 (diff)
download	ninja-7615da5c6ba54bd082eac4b8a6d9196084e5c590.tar.gz

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"> </div>	86	<div class="nj-divider divider-vertical"> </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"> </div>	70	<div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div>	155	<div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div>	51	<div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div>	57	<div class="nj-divider divider-vertical"> </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"> </div>	136	<div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div>	141	<div class="nj-divider divider-vertical"> </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"> </div>	48	<div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div>	52	<div class="nj-divider divider-vertical toolOptionsSpacer"> </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>