Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: Source/WebCore/css/mediaControlsQuickTime.css

Issue 10412040: Merge 116900 - Volume slider needs to be displayed below the mute button (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu tton { 43 audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu tton {
44 -webkit-box-ordinal-group: 2; /* Before the fullscreen button */ 44 -webkit-box-ordinal-group: 2; /* Before the fullscreen button */
45 45
46 width: 14px; 46 width: 14px;
47 height: 12px; 47 height: 12px;
48 margin-left: 2px; 48 margin-left: 2px;
49 margin-right: 9px; 49 margin-right: 9px;
50 border: none !important; 50 border: none !important;
51 51
52 position: relative; 52 position: relative;
53 z-index: 2; 53 z-index: 1;
54 } 54 }
55 55
56 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-bu tton { 56 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-bu tton {
57 width: 16px; 57 width: 16px;
58 height: 16px; 58 height: 16px;
59 margin-left: 6px; 59 margin-left: 6px;
60 margin-right: 1px; 60 margin-right: 1px;
61 border: none !important; 61 border: none !important;
62 } 62 }
63 63
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 margin-right: 7px; 197 margin-right: 7px;
198 -webkit-box-ordinal-group: 3; /* between mute and fullscreen */ 198 -webkit-box-ordinal-group: 3; /* between mute and fullscreen */
199 border: none !important; 199 border: none !important;
200 } 200 }
201 201
202 audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-cont rols-volume-slider-container { 202 audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-cont rols-volume-slider-container {
203 -webkit-appearance: media-volume-slider-container; 203 -webkit-appearance: media-volume-slider-container;
204 position: absolute; 204 position: absolute;
205 205
206 bottom: 0px; 206 bottom: 0px;
207 z-index: 1; 207 z-index: 2;
208 208
209 width: 22px; 209 width: 22px;
210 height: 114px; 210 height: 114px;
211 } 211 }
212 212
213 audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volum e-slider { 213 audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volum e-slider {
214 -webkit-appearance: media-volume-slider; 214 -webkit-appearance: media-volume-slider;
215 display: inline; 215 display: inline;
216 position: absolute; 216 position: absolute;
217 217
218 top: 7px; 218 top: 7px;
219 left: 6px; 219 left: 6px;
220 220
221 width: 10px; 221 width: 10px;
222 height: 80px; 222 height: 80px;
223 } 223 }
224
225 audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-co ntrols-volume-slider-mute-button {
226 -webkit-appearance: media-volume-slider-mute-button;
227 display: inline;
228
229 position: absolute;
230
231 bottom: 7px;
232 left: 0px;
233
234 width: 14px;
235 height: 12px;
236
237 margin-left: 2px;
238 margin-right: 9px;
239
240 border: none !important;
241 }
OLDNEW
« no previous file with comments | « Source/WebCore/css/mediaControlsChromium.css ('k') | Source/WebCore/html/shadow/MediaControlElements.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698