From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- .../montage/ui/video-player.reel/video-player.css | 50 +++++++++++----------- .../montage/ui/video-player.reel/video-player.js | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'node_modules/montage/ui/video-player.reel') 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 position: absolute; display: -webkit-box; -webkit-box-sizing: border-box; - z-index: 1000; /* TODO: Define global z-index regions */ + z-index: 1000; /* TODO: Define global z-index regions */ top: 0; - left: 0; + left: 0; border: none; width: 100%; height: 100%; @@ -66,15 +66,15 @@ MARK: Controller .montage-video-player .control-wrapper { position: absolute; left: 0; - bottom: 0; - right: 0; - height: 50px; - box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4); - background-color: hsla(0,0%,0%,.95); - background-image: -webkit-linear-gradient(top, hsla(0,0%,100%,.27) 0%, - hsla(0,0%,100%,.15) 50%, - hsla(0,0%,30%,.4) 50%, - hsla(0,0%,0%,1) 100%); + bottom: 0; + right: 0; + height: 50px; + box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4); + background-color: hsla(0,0%,0%,.95); + background-image: -webkit-linear-gradient(top, hsla(0,0%,100%,.27) 0%, + hsla(0,0%,100%,.15) 50%, + hsla(0,0%,30%,.4) 50%, + hsla(0,0%,0%,1) 100%); } .montage-video-player .control-wrapper.hide-controls { @@ -170,7 +170,7 @@ MARK: Button Panel background-position: center center; } .montage-video-player .controller-button:active { - background-color: hsla(0,0%,0%,.4); + background-color: hsla(0,0%,0%,.4); } .montage-video-player .play { background-image: url("images/play.png"); } @@ -200,22 +200,22 @@ MARK: Volume Panel .montage-video-player .controller-progress { height: 15px; - box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5); - background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px, - hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px); + box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5); + background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px, + hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px); } .montage-video-player .controller-progress:before { - content: ""; - position: absolute; + content: ""; + position: absolute; top: 0; right: 0; bottom: 0; left: 0; - background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) ); + background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) ); } .montage-video-player .volume-progress { width: 50%; height: 100%; background: -webkit-repeating-linear-gradient(left, hsl(195,90%,50%) 0, hsl(195,90%,50%) 3px, - transparent 3px, transparent 5px); + transparent 3px, transparent 5px); -webkit-transition: width .1s ease-in-out; } @@ -226,15 +226,15 @@ MARK: Volume Panel .montage-video-player .volume-minus { background-image: url("images/volume-down.png"); } .montage-video-player .volume-minus:active { - background-color: transparent; - background-image: url("images/volume-down.png"), - -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); + background-color: transparent; + background-image: url("images/volume-down.png"), + -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); } .montage-video-player .volume-plus { background-image: url("images/volume-up.png"); } .montage-video-player .volume-plus:active { - background-color: transparent; - background-image: url("images/volume-up.png"), - -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); + background-color: transparent; + background-image: url("images/volume-up.png"), + -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); } .montage-video-player .controller-volume-panel .mute { display: none; } /* also MUTE[muted] */ diff --git a/node_modules/montage/ui/video-player.reel/video-player.js b/node_modules/montage/ui/video-player.reel/video-player.js index 351b372c..13cfd845 100755 --- a/node_modules/montage/ui/video-player.reel/video-player.js +++ b/node_modules/montage/ui/video-player.reel/video-player.js @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ "use strict"; /** - @module montage/ui/video-player + @module montage/ui/video-player @requires montage @requires montage/ui/component @requires core/logger -- cgit v1.2.3