aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color/colorpanelbase.reel/colorpanelbase.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/color/colorpanelbase.reel/colorpanelbase.html
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/color/colorpanelbase.reel/colorpanelbase.html')
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html118
1 files changed, 59 insertions, 59 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index 5918a3ae..5ec6cd01 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,12 +29,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY 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 {
39 "owner": { 39 "owner": {
40 "prototype": "js/panels/Color/ColorPanelBase.reel", 40 "prototype": "js/panels/Color/ColorPanelBase.reel",
@@ -68,57 +68,57 @@ POSSIBILITY OF SUCH DAMAGE.
68 } 68 }
69 } 69 }
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>
81 <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button> 81 <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button>
82 </div> 82 </div>
83 <div class="cp_modes"> 83 <div class="cp_modes">
84 <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button> 84 <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button>
85 <hr /> 85 <hr />
86 <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button> 86 <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button>
87 </div> 87 </div>
88 <hr /> 88 <hr />
89 <div class="cp_inputs"> 89 <div class="cp_inputs">
90 <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div> 90 <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div>
91 <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button> 91 <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button>
92 <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div> 92 <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div>
93 <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button> 93 <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button>
94 </div> 94 </div>
95 <div class="cp_options"> 95 <div class="cp_options">
96 <button data-montage-id="btn_default" class="cp_reset">Default Colors</button> 96 <button data-montage-id="btn_default" class="cp_reset">Default Colors</button>
97 <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button> 97 <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button>
98 <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button> 98 <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button>
99 </div> 99 </div>
100 <div class="cp_labels"> 100 <div class="cp_labels">
101 <div data-montage-id="label1" class="sh_label1">R</div> 101 <div data-montage-id="label1" class="sh_label1">R</div>
102 <div data-montage-id="label2" class="sh_label2">G</div> 102 <div data-montage-id="label2" class="sh_label2">G</div>
103 <div data-montage-id="label3" class="sh_label3">B</div> 103 <div data-montage-id="label3" class="sh_label3">B</div>
104 <div data-montage-id="label4" class="sh_label4">A</div> 104 <div data-montage-id="label4" class="sh_label4">A</div>
105 </div> 105 </div>
106 <div class="cp_sliders"> 106 <div class="cp_sliders">
107 <div data-montage-id="slider1" class="cp_slider1"></div> 107 <div data-montage-id="slider1" class="cp_slider1"></div>
108 <div data-montage-id="slider2" class="cp_slider2"></div> 108 <div data-montage-id="slider2" class="cp_slider2"></div>
109 <div data-montage-id="slider3" class="cp_slider3"></div> 109 <div data-montage-id="slider3" class="cp_slider3"></div>
110 <div data-montage-id="slider4" class="cp_slider4"></div> 110 <div data-montage-id="slider4" class="cp_slider4"></div>
111 </div> 111 </div>
112 <div class="cp_hottext"> 112 <div class="cp_hottext">
113 <input data-montage-id="hottext1" class="cp_hottext1"/> 113 <input data-montage-id="hottext1" class="cp_hottext1"/>
114 <input data-montage-id="hottext2" class="cp_hottext2"/> 114 <input data-montage-id="hottext2" class="cp_hottext2"/>
115 <input data-montage-id="hottext3" class="cp_hottext3"/> 115 <input data-montage-id="hottext3" class="cp_hottext3"/>
116 <input data-montage-id="hottext4" class="cp_hottext4"/> 116 <input data-montage-id="hottext4" class="cp_hottext4"/>
117 </div> 117 </div>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 00:24:46 +0000