aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html12
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/css/colorpanelbase.scss14
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html36
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss2
4 files changed, 32 insertions, 32 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index 762602e5..b8d9bda9 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 33
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 34 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 35
36 <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css"> 36 <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css">
37 <script type="text/montage-serialization"> 37 <script type="text/montage-serialization">
38 { 38 {
@@ -70,11 +70,11 @@ POSSIBILITY OF SUCH DAMAGE.
70 70
71 } 71 }
72 </script> 72 </script>
73 73
74 </head> 74 </head>
75 75
76 <body> 76 <body>
77 77
78 <div data-montage-id="cp_expanded" class="cp_expanded"> 78 <div data-montage-id="cp_expanded" class="cp_expanded">
79 <div class="cp_history"> 79 <div class="cp_history">
80 <button data-montage-id="btn_current" class="cp_color_current">Current Color</button> 80 <button data-montage-id="btn_current" class="cp_color_current">Current Color</button>
@@ -118,7 +118,7 @@ POSSIBILITY OF SUCH DAMAGE.
118 <div class="cp_hex">#<input data-montage-id="hextext" class="cp_hottext5" maxlength="6" /></div> 118 <div class="cp_hex">#<input data-montage-id="hextext" class="cp_hottext5" maxlength="6" /></div>
119 <div class="cp_spectrum" data-montage-id="spectrum"></div> 119 <div class="cp_spectrum" data-montage-id="spectrum"></div>
120 </div> 120 </div>
121 121
122 </body> 122 </body>
123 123
124</html> 124</html>
diff --git a/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss
index 9317b592..b8009903 100755
--- a/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss
+++ b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss
@@ -76,7 +76,7 @@ $sprite_stdbtn_spacing: 4;
76 76
77.cp_history button 77.cp_history button
78{ 78{
79 79
80 width: 22px; 80 width: 22px;
81 height: 22px; 81 height: 22px;
82 overflow: hidden; 82 overflow: hidden;
@@ -106,7 +106,7 @@ $sprite_stdbtn_spacing: 4;
106 106
107.cp_expanded .cp_inputs button, .cpe_fill, .cpe_stroke, .cpe_fill_icon, .cpe_stroke_icon 107.cp_expanded .cp_inputs button, .cpe_fill, .cpe_stroke, .cpe_fill_icon, .cpe_stroke_icon
108{ 108{
109 109
110 width: 22px; 110 width: 22px;
111 height: 22px; 111 height: 22px;
112 overflow: hidden; 112 overflow: hidden;
@@ -125,22 +125,22 @@ $sprite_stdbtn_spacing: 4;
125} 125}
126 126
127.cpe_fill_icon, .cpe_fill_icon 127.cpe_fill_icon, .cpe_fill_icon
128{ 128{
129 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*10, 0); 129 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*10, 0);
130} 130}
131 131
132.cpe_fill_icon:hover, .cpe_fill_icon.selected, .cpe_fill_icon:hover, .cpe_fill_icon.selected 132.cpe_fill_icon:hover, .cpe_fill_icon.selected, .cpe_fill_icon:hover, .cpe_fill_icon.selected
133{ 133{
134 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*11, 0); 134 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*11, 0);
135} 135}
136 136
137.cpe_stroke_icon, .cpe_stroke_icon 137.cpe_stroke_icon, .cpe_stroke_icon
138{ 138{
139 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*8, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1); 139 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*8, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1);
140} 140}
141 141
142.cpe_stroke_icon:hover, .cpe_stroke_icon.selected, .cpe_stroke_icon:hover, .cpe_stroke_icon.selected 142.cpe_stroke_icon:hover, .cpe_stroke_icon.selected, .cpe_stroke_icon:hover, .cpe_stroke_icon.selected
143{ 143{
144 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*9, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1); 144 @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*9, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1);
145} 145}
146 146
@@ -203,7 +203,7 @@ $sprite_stdbtn_spacing: 4;
203{ 203{
204 float: left; 204 float: left;
205 margin: 56px 0px 0px -48px; 205 margin: 56px 0px 0px -48px;
206 206
207} 207}
208 208
209.cp_options button 209.cp_options button
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 99b781ab..488a9c75 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -30,12 +30,12 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 33
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 34 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 35
36 <link rel="stylesheet" type="text/css" href="css/colorpanelpopup.css"> 36 <link rel="stylesheet" type="text/css" href="css/colorpanelpopup.css">
37 37
38 <script type="text/montage-serialization"> 38 <script type="text/montage-serialization">
39 { 39 {
40 "owner": { 40 "owner": {
41 "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", 41 "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]",
@@ -56,52 +56,52 @@ POSSIBILITY OF SUCH DAMAGE.
56 "btnPalette": {"#": "btn_palettes"}, 56 "btnPalette": {"#": "btn_palettes"},
57 "btnNocolor": {"#": "btn_nocolor"}, 57 "btnNocolor": {"#": "btn_nocolor"},
58 "inputHex": {"#": "input_hex"} 58 "inputHex": {"#": "input_hex"}
59 59
60 } 60 }
61 } 61 }
62 } 62 }
63 </script> 63 </script>
64 64
65 </head> 65 </head>
66 66
67 <body> 67 <body>
68 68
69 <div data-montage-id="cpp_popup" class="cpp_popup"> 69 <div data-montage-id="cpp_popup" class="cpp_popup">
70 <div class="cp_pu_options"> 70 <div class="cp_pu_options">
71 71
72 <div class="cp_pu_history"> 72 <div class="cp_pu_history">
73 73
74 <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button> 74 <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button>
75 <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button> 75 <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button>
76 76
77 </div> 77 </div>
78 78
79 <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div> 79 <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div>
80 80
81 <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> 81 <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button>
82 <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button> 82 <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button>
83 <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button> 83 <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button>
84 <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button> 84 <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button>
85 <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button> 85 <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button>
86 86
87 </div> 87 </div>
88 88
89 <div class="cp_pu_content"> 89 <div class="cp_pu_content">
90 <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div> 90 <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div>
91 <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div> 91 <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div>
92 <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div> 92 <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div>
93 <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> 93 <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div>
94 </div> 94 </div>
95 95
96 <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> 96 <div data-montage-id="cntnr_alpha" class="cp_pu_alpha">
97 <div class="cp_pu_a_label">Alpha</div>