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

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

Issue 10807077: Merge 123259 - [chromium] CSS tweaks to media controls to prevent styles from being overridden (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. 3 * Copyright (C) 2009 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 -webkit-box-align: center; 72 -webkit-box-align: center;
73 -webkit-box-pack: center; 73 -webkit-box-pack: center;
74 bottom: auto; 74 bottom: auto;
75 height: 30px; 75 height: 30px;
76 background-color: rgba(20, 20, 20, 0.8); 76 background-color: rgba(20, 20, 20, 0.8);
77 border-radius: 5px; 77 border-radius: 5px;
78 } 78 }
79 79
80 audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu tton { 80 audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu tton {
81 -webkit-appearance: media-mute-button; 81 -webkit-appearance: media-mute-button;
82 display: inline; 82 display: -webkit-box;
83 border: none; 83 border: none;
84 box-sizing: border-box; 84 box-sizing: border-box;
85 width: 35px; 85 width: 35px;
86 height: 30px; 86 height: 30px;
87 line-height: 30px; 87 line-height: 30px;
88 margin: 0 6px 0 0; 88 margin: 0 6px 0 0;
89 padding: 0; 89 padding: 0;
90 } 90 }
91 91
92 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-bu tton { 92 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-bu tton {
93 -webkit-appearance: media-play-button; 93 -webkit-appearance: media-play-button;
94 display: inline; 94 display: -webkit-box;
95 border: none; 95 border: none;
96 box-sizing: border-box; 96 box-sizing: border-box;
97 width: 30px; 97 width: 30px;
98 height: 30px; 98 height: 30px;
99 line-height: 30px; 99 line-height: 30px;
100 margin-left: 9px; 100 margin-left: 9px;
101 margin-right: 9px; 101 margin-right: 9px;
102 padding: 0; 102 padding: 0;
103 } 103 }
104 104
105 audio::-webkit-media-controls-current-time-display, video::-webkit-media-control s-current-time-display, 105 audio::-webkit-media-controls-current-time-display, video::-webkit-media-control s-current-time-display,
106 audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-contr ols-time-remaining-display { 106 audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-contr ols-time-remaining-display {
107 -webkit-appearance: media-current-time-display; 107 -webkit-appearance: media-current-time-display;
108 -webkit-user-select: none; 108 -webkit-user-select: none;
109 display: block; 109 display: block;
110 border: none; 110 border: none;
111 cursor: default; 111 cursor: default;
112 112
113 height: 30px; 113 height: 30px;
114 margin: 0 9px 0 0; 114 margin: 0 9px 0 0;
115 padding: 0; 115 padding: 0;
116 116
117 line-height: 30px; 117 line-height: 30px;
118 font-family: Arial, Helvetica, sans-serif; 118 font-family: Arial, Helvetica, sans-serif;
119 font-size: 13px; 119 font-size: 13px;
120 font-weight: bold; 120 font-weight: bold;
121 font-style: normal;
121 color: white; 122 color: white;
122 123
123 letter-spacing: normal; 124 letter-spacing: normal;
124 word-spacing: normal; 125 word-spacing: normal;
125 text-transform: none; 126 text-transform: none;
126 text-indent: 0; 127 text-indent: 0;
127 text-shadow: none; 128 text-shadow: none;
128 text-decoration: none; 129 text-decoration: none;
129 } 130 }
130 131
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 -webkit-appearance: sliderthumb-horizontal; 173 -webkit-appearance: sliderthumb-horizontal;
173 -webkit-box-sizing: border-box; 174 -webkit-box-sizing: border-box;
174 position: relative; 175 position: relative;
175 bottom: 1px; 176 bottom: 1px;
176 margin-left: -7px; 177 margin-left: -7px;
177 margin-right: -7px; 178 margin-right: -7px;
178 } 179 }
179 180
180 audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-f ullscreen-button { 181 audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-f ullscreen-button {
181 -webkit-appearance: media-enter-fullscreen-button; 182 -webkit-appearance: media-enter-fullscreen-button;
182 display: inline; 183 display: -webkit-box;
183 border: none; 184 border: none;
184 box-sizing: border-box; 185 box-sizing: border-box;
185 width: 30px; 186 width: 30px;
186 height: 30px; 187 height: 30px;
187 line-height: 30px; 188 line-height: 30px;
188 margin-left: -5px; 189 margin-left: -5px;
189 margin-right: 9px; 190 margin-right: 9px;
190 padding: 0; 191 padding: 0;
191 } 192 }
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698