diff -Nru jquery-jplayer-pinkflag-2.1.0/debian/changelog jquery-jplayer-pinkflag-2.3.0/debian/changelog --- jquery-jplayer-pinkflag-2.1.0/debian/changelog 2013-04-26 20:12:16.000000000 +0000 +++ jquery-jplayer-pinkflag-2.3.0/debian/changelog 2013-04-26 20:12:16.000000000 +0000 @@ -1,8 +1,21 @@ -jquery-jplayer-pinkflag (2.1.0-1~precise~pgquiles1) precise; urgency=low +jquery-jplayer-pinkflag (2.3.0-1~precise~pgquiles1) precise; urgency=low * Backport to Precise - -- Pau Garcia i Quiles Mon, 15 Apr 2013 23:55:06 +0200 + -- Pau Garcia i Quiles Fri, 26 Apr 2013 21:53:46 +0200 + +jquery-jplayer-pinkflag (2.3.0-1~experimental1) experimental; urgency=low + + * New upstream version + + -- Pau Garcia i Quiles Sun, 21 Apr 2013 21:43:52 +0200 + +jquery-jplayer-pinkflag (2.2.0-1~experimental1) UNRELEASED; urgency=low + + * New upstream version + * Standards 3.9.4.0 + + -- Pau Garcia i Quiles Fri, 12 Apr 2013 01:52:07 +0200 jquery-jplayer-pinkflag (2.1.0-1) unstable; urgency=low diff -Nru jquery-jplayer-pinkflag-2.1.0/debian/control jquery-jplayer-pinkflag-2.3.0/debian/control --- jquery-jplayer-pinkflag-2.1.0/debian/control 2013-04-26 20:12:16.000000000 +0000 +++ jquery-jplayer-pinkflag-2.3.0/debian/control 2013-04-26 20:12:16.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Pau Garcia i Quiles Build-Depends: debhelper (>= 6.0.7~), imagemagick -Standards-Version: 3.9.3.1 +Standards-Version: 3.9.4.0 Homepage: http://www.jplayer.org/ Package: jquery-jplayer-pinkflag diff -Nru jquery-jplayer-pinkflag-2.1.0/jplayer.pink.flag.css jquery-jplayer-pinkflag-2.3.0/jplayer.pink.flag.css --- jquery-jplayer-pinkflag-2.1.0/jplayer.pink.flag.css 2011-09-01 13:56:44.000000000 +0000 +++ jquery-jplayer-pinkflag-2.3.0/jplayer.pink.flag.css 2012-10-22 16:29:44.000000000 +0000 @@ -4,17 +4,18 @@ * * Skin Name: Pink Flag * - * Copyright (c) 2011 Happyworm Ltd + * Copyright (c) 2012 Happyworm Ltd * Dual licensed under the MIT and GPL licenses. * - http://www.opensource.org/licenses/mit-license.php * - http://www.gnu.org/copyleft/gpl.html * * Author: Silvia Benvenuti - * Skin Version: 1.0 (jPlayer 2.1.0) - * Date: 1st September 2011 + * Skin Version: 1.2 (jPlayer 2.2.0) + * Date: 22nd October 2012 */ div.jp-audio, +div.jp-audio-stream, div.jp-video { /* Edit the font-size to counteract inherited font sizing. @@ -31,13 +32,16 @@ border-right:1px solid #180a1f; border-bottom:1px solid #180a1f; background-color:#3a2a45; - position:relative; } div.jp-audio { width:201px; padding:20px; } +div.jp-audio-stream { + width:101px; + padding:20px 20px 10px 20px; +} div.jp-video-270p { width:480px; @@ -50,7 +54,12 @@ width:480px; height:270px; /* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */ - position:static !important; position:relative + position:static !important; position:relative; +} + +/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */ +div.jp-video-full div div { + z-index:1000; } div.jp-video-full div.jp-jplayer { @@ -58,7 +67,6 @@ left: 0; position: fixed !important; position: relative; /* Rules for IE6 (full-screen) */ overflow: hidden; - z-index:1000; } div.jp-video-full div.jp-gui { @@ -67,13 +75,12 @@ left: 0; width:100%; height:100%; - z-index:1000; + z-index:1001; /* 1 layer above the others. */ } div.jp-video-full div.jp-interface { position: absolute !important; position: relative; /* Rules for IE6 (full-screen) */ bottom: 0; left: 0; - z-index:1000; } div.jp-interface { @@ -88,6 +95,11 @@ padding-top:30px; } +div.jp-audio-stream .jp-interface { + height: 50px; + padding-top:30px; +} + /* @group CONTROLS */ div.jp-controls-holder { @@ -107,10 +119,15 @@ height: 34px; } -div.jp-audio ul.jp-controls { +div.jp-audio ul.jp-controls, +div.jp-audio-stream ul.jp-controls { margin:0 auto; } +div.jp-audio-stream ul.jp-controls { + width: 100px; +} + div.jp-video ul.jp-controls { margin:0 0 0 115px; float:left; @@ -153,6 +170,12 @@ background: url("jplayer.pink.flag.jpg") -100px -120px no-repeat; } +/* The right border is normally in the ul background image. */ +div.jp-audio-stream .jp-play, +div.jp-audio-stream .jp-pause { + border-right:1px solid #180920; +} + div.jp-type-single .jp-stop { background: url("jplayer.pink.flag.jpg") 0px -80px no-repeat; } @@ -222,7 +245,6 @@ list-style-type:none; padding:0; margin:0 auto; - z-index:20; overflow:hidden; } @@ -361,12 +383,15 @@ } div.jp-audio ul.jp-controls a.jp-mute, -div.jp-audio ul.jp-controls a.jp-unmute { +div.jp-audio ul.jp-controls a.jp-unmute, +div.jp-audio-stream ul.jp-controls a.jp-mute, +div.jp-audio-stream ul.jp-controls a.jp-unmute { top:-6px; left: 0; } -div.jp-audio ul.jp-controls a.jp-volume-max { +div.jp-audio ul.jp-controls a.jp-volume-max, +div.jp-audio-stream ul.jp-controls a.jp-volume-max { top:-6px; right: 0; } @@ -417,16 +442,24 @@ } -div.jp-audio .jp-interface .jp-volume-bar { +div.jp-audio .jp-interface .jp-volume-bar, +div.jp-audio-stream .jp-interface .jp-volume-bar { top:10px; left: 0; } +div.jp-audio-stream .jp-interface .jp-volume-bar { + width: 97px; + border-right:1px solid #180920; + padding-right:1px; +} + div.jp-video .jp-volume-bar { top: 0; left: 0; width:95px; - border-right:1px solid #000; + border-right:1px solid #180920; + padding-right:1px; margin-top: 30px; } @@ -478,7 +511,6 @@ margin: 0 20px 10px; } - .jp-video .jp-playlist ul { margin: 0 20px; } @@ -499,7 +531,6 @@ text-align:center; } - /* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */ div.jp-type-playlist div.jp-playlist li:first-child { @@ -568,22 +599,20 @@ div.jp-video div.jp-video-play { - position:absolute; - top:0; - left:0; width:100%; + overflow:hidden; /* Important for nested negative margins to work in modern browsers */ cursor:pointer; - background-color:rgba(0,0,0,0); /* Makes IE9 work with the active area over the whole video area. IE6/7/8 only have the button as active area. */ } div.jp-video-270p div.jp-video-play { + margin-top:-270px; height:270px; } div.jp-video-360p div.jp-video-play { + margin-top:-360px; height:360px; } div.jp-video-full div.jp-video-play { height:100%; - z-index:1000; } a.jp-video-play-icon { position:relative; @@ -617,12 +646,6 @@ /* @group NO SOLUTION error feedback */ .jp-no-solution { - position:absolute; - width:390px; - margin-left:-202px; - left:50%; - top: 10px; - padding:5px; font-size:.8em; background-color:#3a2a45; @@ -644,10 +667,4 @@ text-align:center; font-weight:bold; } - -.jp-audio .jp-no-solution { - width:190px; - margin-left:-102px; -} - /* @end */