Changeset 76272 in webkit
- Timestamp:
- Jan 20, 2011 12:41:40 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r76266 r76272 1 2011-01-20 Yi Shen <yi.4.shen@nokia.com> 2 3 Reviewed by Eric Carlson. 4 5 Clean up the Media Controls CSS for Qt 6 https://bugs.webkit.org/show_bug.cgi?id=52822 7 8 Split the audio::-webkit-media-xxx and video::-webkit-media-xxx rules 9 in mediaControlsQt.css, and remove the duplicate audio::-webkit-media-xxx 10 rules from mediaControlsQtFullscreen.css. 11 12 * css/mediaControlsQt.css: 13 (audio::-webkit-media-controls-panel): 14 (video::-webkit-media-controls-panel): 15 (audio::-webkit-media-controls-mute-button): 16 (video::-webkit-media-controls-mute-button): 17 (audio::-webkit-media-controls-play-button): 18 (video::-webkit-media-controls-play-button): 19 (audio::-webkit-media-controls-timeline-container): 20 (video::-webkit-media-controls-timeline-container): 21 (audio::-webkit-media-controls-current-time-display): 22 (video::-webkit-media-controls-current-time-display): 23 (audio::-webkit-media-controls-time-remaining-display): 24 (video::-webkit-media-controls-time-remaining-display): 25 (audio::-webkit-media-controls-timeline): 26 (video::-webkit-media-controls-timeline): 27 (audio::-webkit-media-controls-volume-slider-container): 28 (video::-webkit-media-controls-volume-slider-container): 29 (audio::-webkit-media-controls-volume-slider): 30 (video::-webkit-media-controls-volume-slider): 31 (audio::-webkit-media-controls-seek-back-button): 32 (video::-webkit-media-controls-seek-back-button): 33 (audio::-webkit-media-controls-seek-forward-button): 34 (video::-webkit-media-controls-seek-forward-button): 35 (audio::-webkit-media-controls-fullscreen-button): 36 (video::-webkit-media-controls-fullscreen-button): 37 (audio::-webkit-media-controls-rewind-button): 38 (video::-webkit-media-controls-rewind-button): 39 (audio::-webkit-media-controls-return-to-realtime-button): 40 (video::-webkit-media-controls-return-to-realtime-button): 41 (audio::-webkit-media-controls-toggle-closed-captions-button): 42 (video::-webkit-media-controls-toggle-closed-captions-button): 43 * css/mediaControlsQtFullscreen.css: 44 (video::-webkit-media-controls-time-remaining-display): 45 (video::-webkit-media-controls-seek-back-button): 46 (video::-webkit-media-controls-seek-forward-button): 47 (video::-webkit-media-controls-rewind-button): 48 (video::-webkit-media-controls-return-to-realtime-button): 49 (video::-webkit-media-controls-toggle-closed-captions-button): 50 1 51 2011-01-20 Alexander Pavlov <apavlov@chromium.org> 2 52 -
trunk/Source/WebCore/css/mediaControlsQt.css
r65492 r76272 33 33 } 34 34 35 audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel { 35 audio::-webkit-media-controls-panel { 36 display: -webkit-box; 37 -webkit-box-orient: horizontal; 38 -webkit-box-align: end; 39 -webkit-user-select: none; 40 position: absolute; 41 bottom: 0; 42 width: 100%; 43 z-index: 0; 44 overflow: visible; 45 height: 100%; 46 text-align: right; 47 } 48 49 video::-webkit-media-controls-panel { 36 50 display: -webkit-box; 37 51 -webkit-box-orient: horizontal; … … 51 65 } 52 66 53 audio::-webkit-media-controls-mute-button , video::-webkit-media-controls-mute-button{67 audio::-webkit-media-controls-mute-button { 54 68 width: 12px; 55 69 height: 12px; … … 58 72 } 59 73 60 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button { 74 video::-webkit-media-controls-mute-button { 75 width: 12px; 76 height: 12px; 77 padding: 6px; 78 margin: 5px 5px 5px 3px; 79 } 80 81 audio::-webkit-media-controls-play-button { 61 82 width: 9px; 62 83 height: 12px; … … 65 86 } 66 87 67 audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container { 88 video::-webkit-media-controls-play-button { 89 width: 9px; 90 height: 12px; 91 padding: 6px 12px 6px 11px; 92 margin: 5px 3px 5px 5px; 93 } 94 95 audio::-webkit-media-controls-timeline-container { 68 96 height: 34px; 69 97 } 70 98 71 audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display { 99 video::-webkit-media-controls-timeline-container { 100 height: 34px; 101 } 102 103 audio::-webkit-media-controls-current-time-display { 72 104 -webkit-appearance: media-current-time-display; 73 105 -webkit-user-select: none; … … 87 119 } 88 120 89 audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display { 90 display: none; 91 } 92 93 audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline { 121 video::-webkit-media-controls-current-time-display { 122 -webkit-appearance: media-current-time-display; 123 -webkit-user-select: none; 124 display: inline-block; 125 height: 12px; 126 padding: 6px; 127 margin: 5px 3px; 128 129 overflow: hidden; 130 cursor: default; 131 132 text-align: center; 133 font-size: 10px; 134 font-family: Verdana; 135 font-weight: bold; 136 color: white; 137 } 138 139 audio::-webkit-media-controls-time-remaining-display { 140 display: none; 141 } 142 143 video::-webkit-media-controls-time-remaining-display { 144 display: none; 145 } 146 147 audio::-webkit-media-controls-timeline { 94 148 height: 12px; 95 149 padding: 6px 8px; … … 97 151 } 98 152 99 audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container { 153 video::-webkit-media-controls-timeline { 154 height: 12px; 155 padding: 6px 8px; 156 margin: 5px 3px; 157 } 158 159 audio::-webkit-media-controls-volume-slider-container { 100 160 -webkit-appearance: media-volume-slider-container; 101 161 position: absolute; … … 104 164 } 105 165 106 audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider { 166 video::-webkit-media-controls-volume-slider-container { 167 -webkit-appearance: media-volume-slider-container; 168 position: absolute; 169 height: 103px; 170 width: 24px; 171 } 172 173 audio::-webkit-media-controls-volume-slider { 107 174 -webkit-appearance: media-volume-slider; 108 175 display: inline; … … 115 182 } 116 183 117 audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button { 118 display: none; 119 } 120 121 audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button { 122 display: none; 123 } 124 125 audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button { 126 display: none; 127 } 128 129 audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button { 130 display: none; 131 } 132 133 audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button { 134 display: none; 135 } 136 137 audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button { 138 display: none; 139 } 140 184 video::-webkit-media-controls-volume-slider { 185 -webkit-appearance: media-volume-slider; 186 display: inline; 187 position: absolute; 188 189 width: 12px; 190 padding: 6px; 191 height: 88px; 192 margin: 0 0 3px 0; 193 } 194 195 audio::-webkit-media-controls-seek-back-button { 196 display: none; 197 } 198 199 video::-webkit-media-controls-seek-back-button { 200 display: none; 201 } 202 203 audio::-webkit-media-controls-seek-forward-button { 204 display: none; 205 } 206 207 video::-webkit-media-controls-seek-forward-button { 208 display: none; 209 } 210 211 audio::-webkit-media-controls-fullscreen-button { 212 display: none; 213 } 214 215 video::-webkit-media-controls-fullscreen-button { 216 display: none; 217 } 218 219 audio::-webkit-media-controls-rewind-button { 220 display: none; 221 } 222 223 video::-webkit-media-controls-rewind-button { 224 display: none; 225 } 226 227 audio::-webkit-media-controls-return-to-realtime-button { 228 display: none; 229 } 230 231 video::-webkit-media-controls-return-to-realtime-button { 232 display: none; 233 } 234 235 audio::-webkit-media-controls-toggle-closed-captions-button { 236 display: none; 237 } 238 239 video::-webkit-media-controls-toggle-closed-captions-button { 240 display: none; 241 } 242 -
trunk/Source/WebCore/css/mediaControlsQtFullscreen.css
r75711 r76272 22 22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 */ 24 25 audio {26 height: 34px;27 width: 400px;28 }29 30 audio::-webkit-media-controls-panel {31 display: -webkit-box;32 -webkit-box-orient: horizontal;33 -webkit-box-align: end;34 -webkit-user-select: none;35 position: absolute;36 bottom: 0;37 width: 100%;38 z-index: 0;39 overflow: visible;40 height: 100%;41 text-align: right;42 }43 44 24 video::-webkit-media-controls-panel { 45 25 /* The control panel is only play button for full screen */ … … 55 35 } 56 36 57 audio::-webkit-media-controls-mute-button {58 width: 12px;59 height: 12px;60 padding: 6px;61 margin: 5px 5px 5px 3px;62 }63 64 37 video::-webkit-media-controls-mute-button { 65 38 display: none; 66 }67 68 audio::-webkit-media-controls-play-button {69 width: 9px;70 height: 12px;71 padding: 6px 12px 6px 11px;72 margin: 5px 3px 5px 5px;73 39 } 74 40 … … 82 48 } 83 49 84 audio::-webkit-media-controls-timeline-container {85 height: 34px;86 }87 88 50 video::-webkit-media-controls-timeline-container { 89 51 display: none; 90 }91 92 audio::-webkit-media-controls-current-time-display {93 -webkit-appearance: media-current-time-display;94 -webkit-user-select: none;95 display: inline-block;96 height: 12px;97 padding: 6px;98 margin: 5px 3px;99 100 overflow: hidden;101 cursor: default;102 103 text-align: center;104 font-size: 10px;105 font-family: Verdana;106 font-weight: bold;107 color: white;108 52 } 109 53 … … 114 58 } 115 59 116 audio::-webkit-media-controls-time-remaining-display,video::-webkit-media-controls-time-remaining-display {60 video::-webkit-media-controls-time-remaining-display { 117 61 display: none; 118 }119 120 audio::-webkit-media-controls-timeline {121 height: 12px;122 padding: 6px 8px;123 margin: 5px 3px;124 62 } 125 63 126 64 video::-webkit-media-controls-timeline { 127 65 display: none; 128 }129 130 audio::-webkit-media-controls-volume-slider-container {131 -webkit-appearance: media-volume-slider-container;132 position: absolute;133 height: 103px;134 width: 24px;135 66 } 136 67 … … 140 71 } 141 72 142 audio::-webkit-media-controls-volume-slider {143 -webkit-appearance: media-volume-slider;144 display: inline;145 position: absolute;146 147 width: 12px;148 padding: 6px;149 height: 88px;150 margin: 0 0 3px 0;151 }152 153 73 video::-webkit-media-controls-volume-slider { 154 74 -webkit-appearance: media-volume-slider; … … 156 76 } 157 77 158 audio::-webkit-media-controls-seek-back-button,video::-webkit-media-controls-seek-back-button {78 video::-webkit-media-controls-seek-back-button { 159 79 display: none; 160 80 } 161 81 162 audio::-webkit-media-controls-seek-forward-button,video::-webkit-media-controls-seek-forward-button {82 video::-webkit-media-controls-seek-forward-button { 163 83 display: none; 164 }165 166 audio::-webkit-media-controls-fullscreen-button {167 position: absolute;168 top: 0px;169 right: 0px;170 width: 12px;171 height: 12px;172 padding: 6px;173 margin: 5px 5px 5px 3px;174 84 } 175 85 … … 178 88 } 179 89 180 audio::-webkit-media-controls-rewind-button,video::-webkit-media-controls-rewind-button {90 video::-webkit-media-controls-rewind-button { 181 91 display: none; 182 92 } 183 93 184 audio::-webkit-media-controls-return-to-realtime-button,video::-webkit-media-controls-return-to-realtime-button {94 video::-webkit-media-controls-return-to-realtime-button { 185 95 display: none; 186 96 } 187 97 188 audio::-webkit-media-controls-toggle-closed-captions-button,video::-webkit-media-controls-toggle-closed-captions-button {98 video::-webkit-media-controls-toggle-closed-captions-button { 189 99 display: none; 190 100 } 101
Note: See TracChangeset
for help on using the changeset viewer.