diff options
| author | Kris Kowal | 2012-07-06 12:42:16 -0700 |
|---|---|---|
| committer | Kris Kowal | 2012-07-06 15:01:49 -0700 |
| commit | 6803c0abd279fcb640c38b3881b751bab982cbe0 (patch) | |
| tree | 876211d178954cbaa73e0fbb658fe0c6ffb7ac8d /js/panels/color/colorpanelpopup.reel | |
| parent | 3644cb6def4f681c99959e5729e78ea353441fad (diff) | |
| download | ninja-6803c0abd279fcb640c38b3881b751bab982cbe0.tar.gz | |
Remove trailing spaces
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel')
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 36 | ||||
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | 2 |
2 files changed, 19 insertions, 19 deletions
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> | 97 | <div class="cp_pu_a_label">Alpha</div> |
| 98 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> | 98 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> |
| 99 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> | 99 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> |
| 100 | <div class="cp_pu_a_label2">%</div> | 100 | <div class="cp_pu_a_label2">%</div> |
| 101 | </div> | 101 | </div> |
| 102 | 102 | ||
| 103 | </div> | 103 | </div> |
| 104 | 104 | ||
| 105 | </body> | 105 | </body> |
| 106 | 106 | ||
| 107 | </html> | 107 | </html> |
diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss index ea283466..23446de8 100755 --- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss +++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | |||
| @@ -228,7 +228,7 @@ $grey_light: #494949; | |||
| 228 | { | 228 | { |
| 229 | width: 202px; | 229 | width: 202px; |
| 230 | height: 202px; | 230 | height: 202px; |
| 231 | 231 | ||
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | .cp_pu_palette_container | 234 | .cp_pu_palette_container |