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

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

Issue 6880352: Merge 85290 - 2011-04-28 Steve Lacey <sjl@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 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
« 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 -webkit-appearance: media-current-time-display; 96 -webkit-appearance: media-current-time-display;
97 -webkit-user-select: none; 97 -webkit-user-select: none;
98 display: -webkit-box; 98 display: -webkit-box;
99 -webkit-box-flex: 0; 99 -webkit-box-flex: 0;
100 -webkit-box-pack: center; 100 -webkit-box-pack: center;
101 -webkit-box-align: center; 101 -webkit-box-align: center;
102 102
103 overflow: hidden; 103 overflow: hidden;
104 cursor: default; 104 cursor: default;
105 105
106 position: absolute;
107 top: 6px;
108 right: 0;
109
106 line-height: 21px; 110 line-height: 21px;
107 height: 20px; 111 height: 20px;
108 width: 58px; 112 width: 58px;
109 113
110 text-align: center; 114 text-align: center;
111 font-family: Arial; 115 font-family: Arial;
112 font-size: 16px; 116 font-size: 16px;
113 font-weight: bold; 117 font-weight: bold;
114 color: white; 118 color: white;
115 119
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 text-shadow: none; 153 text-shadow: none;
150 text-decoration: none; 154 text-decoration: none;
151 } 155 }
152 156
153 audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline { 157 audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
154 -webkit-appearance: media-slider; 158 -webkit-appearance: media-slider;
155 display: -webkit-box; 159 display: -webkit-box;
156 box-sizing: border-box; 160 box-sizing: border-box;
157 -webkit-box-flex: 1; 161 -webkit-box-flex: 1;
158 162
163 position: absolute;
164 top: 7px;
165 left: 6px;
166 right: 64px;
167
159 padding: 0px; 168 padding: 0px;
160 margin: 0px 6px; 169 margin: 0px;
161 height: 18px; 170 height: 18px;
162 171
163 border-color: rgba(255, 255, 255, 0.2); 172 border-color: rgba(255, 255, 255, 0.2);
164 border-style: solid; 173 border-style: solid;
165 border-width: 1px; 174 border-width: 1px;
166 border-radius: 2px; 175 border-radius: 2px;
167 background-color: rgba(255, 255, 255, 0.08); 176 background-color: rgba(255, 255, 255, 0.08);
168 color: rgb(50, 140, 223); 177 color: rgb(50, 140, 223);
169 } 178 }
170 179
(...skipping 26 matching lines...) Expand all
197 -webkit-appearance: media-volume-slider; 206 -webkit-appearance: media-volume-slider;
198 display: inline; 207 display: inline;
199 position: absolute; 208 position: absolute;
200 209
201 top: 10px; 210 top: 10px;
202 left: 12px; 211 left: 12px;
203 212
204 width: 10px; 213 width: 10px;
205 height: 80px; 214 height: 80px;
206 } 215 }
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