Commit b5cbaed7 authored by yi.4.shen@nokia.com's avatar yi.4.shen@nokia.com
Browse files

2011-01-20 Yi Shen <yi.4.shen@nokia.com>

        Reviewed by Eric Carlson.

        Clean up the Media Controls CSS for Qt
        https://bugs.webkit.org/show_bug.cgi?id=52822

        Split the audio::-webkit-media-xxx and video::-webkit-media-xxx rules
        in mediaControlsQt.css, and remove the duplicate audio::-webkit-media-xxx
        rules from mediaControlsQtFullscreen.css.

        * css/mediaControlsQt.css:
        (audio::-webkit-media-controls-panel):
        (video::-webkit-media-controls-panel):
        (audio::-webkit-media-controls-mute-button):
        (video::-webkit-media-controls-mute-button):
        (audio::-webkit-media-controls-play-button):
        (video::-webkit-media-controls-play-button):
        (audio::-webkit-media-controls-timeline-container):
        (video::-webkit-media-controls-timeline-container):
        (audio::-webkit-media-controls-current-time-display):
        (video::-webkit-media-controls-current-time-display):
        (audio::-webkit-media-controls-time-remaining-display):
        (video::-webkit-media-controls-time-remaining-display):
        (audio::-webkit-media-controls-timeline):
        (video::-webkit-media-controls-timeline):
        (audio::-webkit-media-controls-volume-slider-container):
        (video::-webkit-media-controls-volume-slider-container):
        (audio::-webkit-media-controls-volume-slider):
        (video::-webkit-media-controls-volume-slider):
        (audio::-webkit-media-controls-seek-back-button):
        (video::-webkit-media-controls-seek-back-button):
        (audio::-webkit-media-controls-seek-forward-button):
        (video::-webkit-media-controls-seek-forward-button):
        (audio::-webkit-media-controls-fullscreen-button):
        (video::-webkit-media-controls-fullscreen-button):
        (audio::-webkit-media-controls-rewind-button):
        (video::-webkit-media-controls-rewind-button):
        (audio::-webkit-media-controls-return-to-realtime-button):
        (video::-webkit-media-controls-return-to-realtime-button):
        (audio::-webkit-media-controls-toggle-closed-captions-button):
        (video::-webkit-media-controls-toggle-closed-captions-button):
        * css/mediaControlsQtFullscreen.css:
        (video::-webkit-media-controls-time-remaining-display):
        (video::-webkit-media-controls-seek-back-button):
        (video::-webkit-media-controls-seek-forward-button):
        (video::-webkit-media-controls-rewind-button):
        (video::-webkit-media-controls-return-to-realtime-button):
        (video::-webkit-media-controls-toggle-closed-captions-button):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c60e7f83
2011-01-20 Yi Shen <yi.4.shen@nokia.com>
Reviewed by Eric Carlson.
Clean up the Media Controls CSS for Qt
https://bugs.webkit.org/show_bug.cgi?id=52822
Split the audio::-webkit-media-xxx and video::-webkit-media-xxx rules
in mediaControlsQt.css, and remove the duplicate audio::-webkit-media-xxx
rules from mediaControlsQtFullscreen.css.
* css/mediaControlsQt.css:
(audio::-webkit-media-controls-panel):
(video::-webkit-media-controls-panel):
(audio::-webkit-media-controls-mute-button):
(video::-webkit-media-controls-mute-button):
(audio::-webkit-media-controls-play-button):
(video::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-timeline-container):
(video::-webkit-media-controls-timeline-container):
(audio::-webkit-media-controls-current-time-display):
(video::-webkit-media-controls-current-time-display):
(audio::-webkit-media-controls-time-remaining-display):
(video::-webkit-media-controls-time-remaining-display):
(audio::-webkit-media-controls-timeline):
(video::-webkit-media-controls-timeline):
(audio::-webkit-media-controls-volume-slider-container):
(video::-webkit-media-controls-volume-slider-container):
(audio::-webkit-media-controls-volume-slider):
(video::-webkit-media-controls-volume-slider):
(audio::-webkit-media-controls-seek-back-button):
(video::-webkit-media-controls-seek-back-button):
(audio::-webkit-media-controls-seek-forward-button):
(video::-webkit-media-controls-seek-forward-button):
(audio::-webkit-media-controls-fullscreen-button):
(video::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-rewind-button):
(video::-webkit-media-controls-rewind-button):
(audio::-webkit-media-controls-return-to-realtime-button):
(video::-webkit-media-controls-return-to-realtime-button):
(audio::-webkit-media-controls-toggle-closed-captions-button):
(video::-webkit-media-controls-toggle-closed-captions-button):
* css/mediaControlsQtFullscreen.css:
(video::-webkit-media-controls-time-remaining-display):
(video::-webkit-media-controls-seek-back-button):
(video::-webkit-media-controls-seek-forward-button):
(video::-webkit-media-controls-rewind-button):
(video::-webkit-media-controls-return-to-realtime-button):
(video::-webkit-media-controls-toggle-closed-captions-button):
2011-01-20 Alexander Pavlov <apavlov@chromium.org>
 
Reviewed by Pavel Feldman.
......@@ -32,7 +32,21 @@ audio {
width: 400px;
}
audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
audio::-webkit-media-controls-panel {
display: -webkit-box;
-webkit-box-orient: horizontal;
-webkit-box-align: end;
-webkit-user-select: none;
position: absolute;
bottom: 0;
width: 100%;
z-index: 0;
overflow: visible;
height: 100%;
text-align: right;
}
video::-webkit-media-controls-panel {
display: -webkit-box;
-webkit-box-orient: horizontal;
-webkit-box-align: end;
......@@ -50,25 +64,61 @@ video:-webkit-full-page-media::-webkit-media-controls-panel {
bottom: 0px;
}
audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
audio::-webkit-media-controls-mute-button {
width: 12px;
height: 12px;
padding: 6px;
margin: 5px 5px 5px 3px;
}
audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
video::-webkit-media-controls-mute-button {
width: 12px;
height: 12px;
padding: 6px;
margin: 5px 5px 5px 3px;
}
audio::-webkit-media-controls-play-button {
width: 9px;
height: 12px;
padding: 6px 12px 6px 11px;
margin: 5px 3px 5px 5px;
}
audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
video::-webkit-media-controls-play-button {
width: 9px;
height: 12px;
padding: 6px 12px 6px 11px;
margin: 5px 3px 5px 5px;
}
audio::-webkit-media-controls-timeline-container {
height: 34px;
}
video::-webkit-media-controls-timeline-container {
height: 34px;
}
audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
audio::-webkit-media-controls-current-time-display {
-webkit-appearance: media-current-time-display;
-webkit-user-select: none;
display: inline-block;
height: 12px;
padding: 6px;
margin: 5px 3px;
overflow: hidden;
cursor: default;
text-align: center;
font-size: 10px;
font-family: Verdana;
font-weight: bold;
color: white;
}
video::-webkit-media-controls-current-time-display {
-webkit-appearance: media-current-time-display;
-webkit-user-select: none;
display: inline-block;
......@@ -86,24 +136,41 @@ audio::-webkit-media-controls-current-time-display, video::-webkit-media-control
color: white;
}
audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
audio::-webkit-media-controls-time-remaining-display {
display: none;
}
video::-webkit-media-controls-time-remaining-display {
display: none;
}
audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
audio::-webkit-media-controls-timeline {
height: 12px;
padding: 6px 8px;
margin: 5px 3px;
}
audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
video::-webkit-media-controls-timeline {
height: 12px;
padding: 6px 8px;
margin: 5px 3px;
}
audio::-webkit-media-controls-volume-slider-container {
-webkit-appearance: media-volume-slider-container;
position: absolute;
height: 103px;
width: 24px;
}
video::-webkit-media-controls-volume-slider-container {
-webkit-appearance: media-volume-slider-container;
position: absolute;
height: 103px;
width: 24px;
}
audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
audio::-webkit-media-controls-volume-slider {
-webkit-appearance: media-volume-slider;
display: inline;
position: absolute;
......@@ -114,27 +181,62 @@ audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volum
margin: 0 0 3px 0;
}
audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
video::-webkit-media-controls-volume-slider {
-webkit-appearance: media-volume-slider;
display: inline;
position: absolute;
width: 12px;
padding: 6px;
height: 88px;
margin: 0 0 3px 0;
}
audio::-webkit-media-controls-seek-back-button {
display: none;
}
video::-webkit-media-controls-seek-back-button {
display: none;
}
audio::-webkit-media-controls-seek-forward-button {
display: none;
}
video::-webkit-media-controls-seek-forward-button {
display: none;
}
audio::-webkit-media-controls-fullscreen-button {
display: none;
}
video::-webkit-media-controls-fullscreen-button {
display: none;
}
audio::-webkit-media-controls-rewind-button {
display: none;
}
audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
video::-webkit-media-controls-rewind-button {
display: none;
}
audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
audio::-webkit-media-controls-return-to-realtime-button {
display: none;
}
audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button {
video::-webkit-media-controls-return-to-realtime-button {
display: none;
}
audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button {
audio::-webkit-media-controls-toggle-closed-captions-button {
display: none;
}
audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
video::-webkit-media-controls-toggle-closed-captions-button {
display: none;
}
......@@ -21,26 +21,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
audio {
height: 34px;
width: 400px;
}
audio::-webkit-media-controls-panel {
display: -webkit-box;
-webkit-box-orient: horizontal;
-webkit-box-align: end;
-webkit-user-select: none;
position: absolute;
bottom: 0;
width: 100%;
z-index: 0;
overflow: visible;
height: 100%;
text-align: right;
}
video::-webkit-media-controls-panel {
/* The control panel is only play button for full screen */
display: -webkit-box;
......@@ -54,24 +34,10 @@ video:-webkit-full-page-media::-webkit-media-controls-panel {
display: none;
}
audio::-webkit-media-controls-mute-button {
width: 12px;
height: 12px;
padding: 6px;
margin: 5px 5px 5px 3px;
}
video::-webkit-media-controls-mute-button {
display: none;
}
audio::-webkit-media-controls-play-button {
width: 9px;
height: 12px;
padding: 6px 12px 6px 11px;
margin: 5px 3px 5px 5px;
}
video::-webkit-media-controls-play-button {
display: -webkit-box;
-webkit-box-align: center;
......@@ -81,110 +47,55 @@ video::-webkit-media-controls-play-button {
padding: 20px;
}
audio::-webkit-media-controls-timeline-container {
height: 34px;
}
video::-webkit-media-controls-timeline-container {
display: none;
}
audio::-webkit-media-controls-current-time-display {
-webkit-appearance: media-current-time-display;
-webkit-user-select: none;
display: inline-block;
height: 12px;
padding: 6px;
margin: 5px 3px;
overflow: hidden;
cursor: default;
text-align: center;
font-size: 10px;
font-family: Verdana;
font-weight: bold;
color: white;
}
video::-webkit-media-controls-current-time-display {
-webkit-appearance: media-current-time-display;
-webkit-user-select: none;
display: none;
}
audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display {
video::-webkit-media-controls-time-remaining-display {
display: none;
}
audio::-webkit-media-controls-timeline {
height: 12px;
padding: 6px 8px;
margin: 5px 3px;
}
video::-webkit-media-controls-timeline {
display: none;
}
audio::-webkit-media-controls-volume-slider-container {
-webkit-appearance: media-volume-slider-container;
position: absolute;
height: 103px;
width: 24px;
}
video::-webkit-media-controls-volume-slider-container {
-webkit-appearance: media-volume-slider-container;
display: none;
}
audio::-webkit-media-controls-volume-slider {
-webkit-appearance: media-volume-slider;
display: inline;
position: absolute;
width: 12px;
padding: 6px;
height: 88px;
margin: 0 0 3px 0;
}
video::-webkit-media-controls-volume-slider {
-webkit-appearance: media-volume-slider;
display: none;
}
audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
video::-webkit-media-controls-seek-back-button {
display: none;
}
audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
video::-webkit-media-controls-seek-forward-button {
display: none;
}
audio::-webkit-media-controls-fullscreen-button {
position: absolute;
top: 0px;
right: 0px;
width: 12px;
height: 12px;
padding: 6px;
margin: 5px 5px 5px 3px;
}
video::-webkit-media-controls-fullscreen-button {
display: none;
}
audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button {
video::-webkit-media-controls-rewind-button {
display: none;
}
audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button {
video::-webkit-media-controls-return-to-realtime-button {
display: none;
}
audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
video::-webkit-media-controls-toggle-closed-captions-button {
display: none;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment