diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-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/colorpanelpopup.reel/css/colorpanelpopup.scss')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss index 32cc0fbf..23446de8 100755 --- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss +++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss | |||
@@ -34,62 +34,62 @@ $grey_light: #494949; | |||
34 | 34 | ||
35 | .cpp_popup | 35 | .cpp_popup |
36 | { | 36 | { |
37 | overflow: hidden; | 37 | overflow: hidden; |
38 | font-size: 12px; | 38 | font-size: 12px; |
39 | text-shadow: 1px 1px 1px #000; | 39 | text-shadow: 1px 1px 1px #000; |
40 | font-family: 'Droid Sans', sans-serif; | 40 | font-family: 'Droid Sans', sans-serif; |
41 | } | 41 | } |
42 | 42 | ||
43 | .cp_pu_options | 43 | .cp_pu_options |
44 | { | 44 | { |
45 | float: left; | 45 | float: left; |
46 | clear: both; | 46 | clear: both; |
47 | width: 100%; | 47 | width: 100%; |
48 | } | 48 | } |
49 | 49 | ||
50 | .cp_pu_options button | 50 | .cp_pu_options button |
51 | { | 51 | { |
52 | display: block; | 52 | display: block; |
53 | width: 16px; | 53 | width: 16px; |
54 | height: 16px; | 54 | height: 16px; |
55 | margin: 4px 0px 2px 2px; | 55 | margin: 4px 0px 2px 2px; |
56 | text-indent: -9999px; | 56 | text-indent: -9999px; |
57 | overflow: hidden; | 57 | overflow: hidden; |
58 | float: right; | 58 | float: right; |
59 | padding: 0; | 59 | padding: 0; |
60 | cursor: pointer; | 60 | cursor: pointer; |
61 | border: 1px solid transparent; | 61 | border: 1px solid transparent; |
62 | } | 62 | } |
63 | 63 | ||
64 | .cp_pu_options button:hover | 64 | .cp_pu_options button:hover |
65 | { | 65 | { |
66 | border: 1px solid #FFF; | 66 | border: 1px solid #FFF; |
67 | box-shadow: 0px 0px 4px #000; | 67 | box-shadow: 0px 0px 4px #000; |
68 | } | 68 | } |
69 | 69 | ||
70 | .cp_pu_wheel | 70 | .cp_pu_wheel |
71 | { | 71 | { |
72 | background: url(../img/icon_colorwheel.png) no-repeat transparent top left; | 72 | background: url(../img/icon_colorwheel.png) no-repeat transparent top left; |
73 | } | 73 | } |
74 | 74 | ||
75 | .cp_pu_images | 75 | .cp_pu_images |
76 | { | 76 | { |
77 | background: url(../img/icon_bitmap.png) no-repeat #000 top left; | 77 | background: url(../img/icon_bitmap.png) no-repeat #000 top left; |
78 | } | 78 | } |
79 | 79 | ||
80 | .cp_pu_gradients | 80 | .cp_pu_gradients |
81 | { | 81 | { |
82 | background: url(../img/icon_gradient.png) no-repeat #000 top left; | 82 | background: url(../img/icon_gradient.png) no-repeat #000 top left; |
83 | } | 83 | } |
84 | 84 | ||
85 | .cp_pu_palettes | 85 | .cp_pu_palettes |
86 | { | 86 | { |
87 | background: url(../img/icon_palette.jpg) no-repeat #000 -1px -1px; | 87 | background: url(../img/icon_palette.jpg) no-repeat #000 -1px -1px; |
88 | } | 88 | } |
89 | 89 | ||
90 | .cp_pu_nocolor | 90 | .cp_pu_nocolor |
91 | { | 91 | { |
92 | background: url(../img/icon_nofill.png) no-repeat #000 top left; | 92 | background: url(../img/icon_nofill.png) no-repeat #000 top left; |
93 | } | 93 | } |
94 | 94 | ||
95 | .cp_pu_history { | 95 | .cp_pu_history { |
@@ -113,14 +113,14 @@ $grey_light: #494949; | |||
113 | 113 | ||
114 | .cp_pu_history button:hover | 114 | .cp_pu_history button:hover |
115 | { | 115 | { |
116 | border: solid 1px #000 !important; | 116 | border: solid 1px #000 !important; |
117 | box-shadow: none !important; | 117 | box-shadow: none !important; |
118 | } | 118 | } |
119 | 119 | ||
120 | .cp_pu_hex | 120 | .cp_pu_hex |
121 | { | 121 | { |
122 | float: left; | 122 | float: left; |
123 | margin: 3px 2px 0px 6px; | 123 | margin: 3px 2px 0px 6px; |
124 | } | 124 | } |
125 | 125 | ||
126 | .cp_pu_hex input { | 126 | .cp_pu_hex input { |
@@ -150,115 +150,115 @@ $grey_light: #494949; | |||
150 | 150 | ||
151 | .cp_pu_content | 151 | .cp_pu_content |
152 | { | 152 | { |
153 | float: left; | 153 | float: left; |
154 | clear: both; | 154 | clear: both; |
155 | width: 100%; | 155 | width: 100%; |
156 | margin: 6px 0px; | 156 | margin: 6px 0px; |
157 | } | 157 | } |
158 | 158 | ||
159 | .cp_pu_content div.cp_pu_content_container | 159 | .cp_pu_content div.cp_pu_content_container |
160 | { | 160 | { |
161 | display: none; | 161 | display: none; |
162 | } | 162 | } |
163 | 163 | ||
164 | .cp_pu_alpha | 164 | .cp_pu_alpha |
165 | { | 165 | { |
166 | float: left; | 166 | float: left; |
167 | clear: both; | 167 | clear: both; |
168 | width: 100%; | 168 | width: 100%; |
169 | margin: 0px; | 169 | margin: 0px; |
170 | } | 170 | } |
171 | 171 | ||
172 | .cp_pu_alpha .slider-track | 172 | .cp_pu_alpha .slider-track |
173 | { | 173 | { |
174 | background: none; | 174 | background: none; |
175 | } | 175 | } |
176 | 176 | ||
177 | .cp_pu_alpha .knob | 177 | .cp_pu_alpha .knob |
178 | { | 178 | { |
179 | background: url(../img/knob.png) no-repeat transparent center center; | 179 | background: url(../img/knob.png) no-repeat transparent center center; |
180 | } | 180 | } |
181 | 181 | ||
182 | .cp_pu_a_label, .cp_pu_a_label2 | 182 | .cp_pu_a_label, .cp_pu_a_label2 |
183 | { | 183 | { |
184 | float: left; | 184 | float: left; |
185 | width: auto; | 185 | width: auto; |
186 | font-size: 11px; | 186 | font-size: 11px; |
187 | } | 187 | } |
188 | 188 | ||
189 | .cp_pu_a_slider | 189 | .cp_pu_a_slider |
190 | { | 190 | { |
191 | width: 120px; | 191 | width: 120px; |
192 | height: 12px; | 192 | height: 12px; |
193 | float: left; | 193 | float: left; |
194 | clear: none; | 194 | clear: none; |
195 | margin: 0px 10px 5px 10px; | 195 | margin: 0px 10px 5px 10px; |
196 | } | 196 | } |
197 | 197 | ||
198 | .cp_pu_a_hottext.hottext | 198 | .cp_pu_a_hottext.hottext |
199 | { | 199 | { |
200 | background: none; | 200 | background: none; |
201 | float: left; | 201 | float: left; |
202 | margin: -1px 2px 0px 0px; | 202 | margin: -1px 2px 0px 0px; |
203 | padding: 0px; | 203 | padding: 0px; |
204 | width: 23px; |