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 /node_modules/montage/ui/video-player.reel/video-player.css | |
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 'node_modules/montage/ui/video-player.reel/video-player.css')
-rwxr-xr-x | node_modules/montage/ui/video-player.reel/video-player.css | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/node_modules/montage/ui/video-player.reel/video-player.css b/node_modules/montage/ui/video-player.reel/video-player.css index dd082439..135f0099 100755 --- a/node_modules/montage/ui/video-player.reel/video-player.css +++ b/node_modules/montage/ui/video-player.reel/video-player.css | |||
@@ -44,9 +44,9 @@ MARK: media | |||
44 | position: absolute; | 44 | position: absolute; |
45 | display: -webkit-box; | 45 | display: -webkit-box; |
46 | -webkit-box-sizing: border-box; | 46 | -webkit-box-sizing: border-box; |
47 | z-index: 1000; /* TODO: Define global z-index regions */ | 47 | z-index: 1000; /* TODO: Define global z-index regions */ |
48 | top: 0; | 48 | top: 0; |
49 | left: 0; | 49 | left: 0; |
50 | border: none; | 50 | border: none; |
51 | width: 100%; | 51 | width: 100%; |
52 | height: 100%; | 52 | height: 100%; |
@@ -66,15 +66,15 @@ MARK: Controller | |||
66 | .montage-video-player .control-wrapper { | 66 | .montage-video-player .control-wrapper { |
67 | position: absolute; | 67 | position: absolute; |
68 | left: 0; | 68 | left: 0; |
69 | bottom: 0; | 69 | bottom: 0; |
70 | right: 0; | 70 | right: 0; |
71 | height: 50px; | 71 | height: 50px; |
72 | box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4); | 72 | box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4); |
73 | background-color: hsla(0,0%,0%,.95); | 73 | background-color: hsla(0,0%,0%,.95); |
74 | background-image: -webkit-linear-gradient(top, hsla(0,0%,100%,.27) 0%, | 74 | background-image: -webkit-linear-gradient(top, hsla(0,0%,100%,.27) 0%, |
75 | hsla(0,0%,100%,.15) 50%, | 75 | hsla(0,0%,100%,.15) 50%, |
76 | hsla(0,0%,30%,.4) 50%, | 76 | hsla(0,0%,30%,.4) 50%, |
77 | hsla(0,0%,0%,1) 100%); | 77 | hsla(0,0%,0%,1) 100%); |
78 | } | 78 | } |
79 | 79 | ||
80 | .montage-video-player .control-wrapper.hide-controls { | 80 | .montage-video-player .control-wrapper.hide-controls { |
@@ -170,7 +170,7 @@ MARK: Button Panel | |||
170 | background-position: center center; | 170 | background-position: center center; |
171 | } | 171 | } |
172 | .montage-video-player .controller-button:active { | 172 | .montage-video-player .controller-button:active { |
173 | background-color: hsla(0,0%,0%,.4); | 173 | background-color: hsla(0,0%,0%,.4); |
174 | } | 174 | } |
175 | 175 | ||
176 | .montage-video-player .play { background-image: url("images/play.png"); } | 176 | .montage-video-player .play { background-image: url("images/play.png"); } |
@@ -200,22 +200,22 @@ MARK: Volume Panel | |||
200 | 200 | ||
201 | .montage-video-player .controller-progress { | 201 | .montage-video-player .controller-progress { |
202 | height: 15px; | 202 | height: 15px; |
203 | box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5); | 203 | box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5); |
204 | background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px, | 204 | background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px, |
205 | hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px); | 205 | hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px); |
206 | } | 206 | } |
207 | .montage-video-player .controller-progress:before { | 207 | .montage-video-player .controller-progress:before { |
208 | content: ""; | 208 | content: ""; |
209 | position: absolute; | 209 | position: absolute; |
210 | top: 0; right: 0; bottom: 0; left: 0; | 210 | top: 0; right: 0; bottom: 0; left: 0; |
211 | background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) ); | 211 | background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) ); |
212 | } | 212 | } |
213 | 213 | ||
214 | .montage-video-player .volume-progress { | 214 | .montage-video-player .volume-progress { |
215 | width: 50%; | 215 | width: 50%; |
216 | height: 100%; | 216 | height: 100%; |
217 | background: -webkit-repeating-linear-gradient(left, hsl(195,90%,50%) 0, hsl(195,90%,50%) 3px, | 217 | background: -webkit-repeating-linear-gradient(left, hsl(195,90%,50%) 0, hsl(195,90%,50%) 3px, |
218 | transparent 3px, transparent 5px); | 218 | transparent 3px, transparent 5px); |
219 | -webkit-transition: width .1s ease-in-out; | 219 | -webkit-transition: width .1s ease-in-out; |
220 | } | 220 | } |
221 | 221 | ||
@@ -226,15 +226,15 @@ MARK: Volume Panel | |||
226 | 226 | ||
227 | .montage-video-player .volume-minus { background-image: url("images/volume-down.png"); } | 227 | .montage-video-player .volume-minus { background-image: url("images/volume-down.png"); } |
228 | .montage-video-player .volume-minus:active { | 228 | .montage-video-player .volume-minus:active { |
229 | background-color: transparent; | 229 | background-color: transparent; |
230 | background-image: url("images/volume-down.png"), | 230 | background-image: url("images/volume-down.png"), |
231 | -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); | 231 | -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); |
232 | } | 232 | } |
233 | .montage-video-player .volume-plus { background-image: url("images/volume-up.png"); } | 233 | .montage-video-player .volume-plus { background-image: url("images/volume-up.png"); } |
234 | .montage-video-player .volume-plus:active { | 234 | .montage-video-player .volume-plus:active { |
235 | background-color: transparent; | 235 | background-color: transparent; |
236 | background-image: url("images/volume-up.png"), | 236 | background-image: url("images/volume-up.png"), |
237 | -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); | 237 | -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); |
238 | } | 238 | } |
239 | 239 | ||
240 | .montage-video-player .controller-volume-panel .mute { display: none; } /* also MUTE[muted] */ | 240 | .montage-video-player .controller-volume-panel .mute { display: none; } /* also MUTE[muted] */ |