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

Side by Side Diff: ui/file_manager/video_player/css/media_controls.css

Issue 603273006: Move the casting icon to media controls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 .media-button { 5 .media-button {
6 height: 28px; 6 height: 28px;
7 margin: 0 5px;
7 position: relative; 8 position: relative;
8 width: 26px; 9 width: 26px;
9 } 10 }
10 11
11 .media-button > div { 12 .media-button > div {
13 background: center center;
12 height: 100%; 14 height: 100%;
13 opacity: 0; 15 opacity: 0;
14 pointer-events: none; 16 pointer-events: none;
15 position: absolute; 17 position: absolute;
16 transition: opacity 100ms linear; 18 transition: opacity 100ms linear;
17 width: 100%; 19 width: 100%;
18 } 20 }
19 21
20 .media-button[state='default']:not(.disabled):not(:hover):not(:active) > 22 .media-button[state='default']:not(.disabled):not(:hover):not(:active) >
21 .default.normal, 23 .default.normal,
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 181 }
180 182
181 .custom-slider > .bar > .seek-mark.visible > .seek-label { 183 .custom-slider > .bar > .seek-mark.visible > .seek-label {
182 opacity: 1; 184 opacity: 1;
183 } 185 }
184 186
185 /* Media controls in order of appearance. */ 187 /* Media controls in order of appearance. */
186 188
187 /* Play/pause button. */ 189 /* Play/pause button. */
188 190
189 .media-button.play {
190 margin-left: -7px;
191 margin-right: -7px;
192 }
193
194 .media-button.play > .default.normal { 191 .media-button.play > .default.normal {
195 background-image: -webkit-image-set( 192 background-image: -webkit-image-set(
196 url('../images/media/media_play.png') 1x, 193 url('../images/media/media_play.png') 1x,
197 url('../images/media/2x/media_play.png') 2x); 194 url('../images/media/2x/media_play.png') 2x);
198 } 195 }
199 196
200 .media-button.play > .default.hover { 197 .media-button.play > .default.hover {
201 background-image: -webkit-image-set( 198 background-image: -webkit-image-set(
202 url('../images/media/media_play_hover.png') 1x, 199 url('../images/media/media_play_hover.png') 1x,
203 url('../images/media/2x/media_play_hover.png') 2x); 200 url('../images/media/2x/media_play_hover.png') 2x);
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 .custom-slider.progress > .bar { 294 .custom-slider.progress > .bar {
298 left: 14px; /* Exactly 1/2 of the thumb width */ 295 left: 14px; /* Exactly 1/2 of the thumb width */
299 right: 14px; 296 right: 14px;
300 } 297 }
301 298
302 /* Time display. */ 299 /* Time display. */
303 300
304 .time-controls > .time { 301 .time-controls > .time {
305 cursor: default; 302 cursor: default;
306 height: 100%; 303 height: 100%;
307 margin-left: 15px; 304 margin-left: 10px;
308 position: relative; 305 position: relative;
309 } 306 }
310 307
311 .time-controls > .time.disabled { 308 .time-controls > .time.disabled {
312 opacity: 0; 309 opacity: 0;
313 } 310 }
314 311
315 /* Invisible div used to compute the width required for the elapsed time. */ 312 /* Invisible div used to compute the width required for the elapsed time. */
316 .time-controls > .time > .duration { 313 .time-controls > .time > .duration {
317 color: transparent; 314 color: transparent;
(...skipping 17 matching lines...) Expand all
335 -webkit-box-align: center; 332 -webkit-box-align: center;
336 -webkit-box-orient: horizontal; 333 -webkit-box-orient: horizontal;
337 -webkit-box-pack: center; 334 -webkit-box-pack: center;
338 display: -webkit-box; 335 display: -webkit-box;
339 height: 100%; 336 height: 100%;
340 } 337 }
341 338
342 /* Sound button */ 339 /* Sound button */
343 340
344 .media-button.sound { 341 .media-button.sound {
345 margin-left: -4px;
346 width: 31px; 342 width: 31px;
347 } 343 }
348 344
349 .media-button.sound[level='0'] > .normal { 345 .media-button.sound[level='0'] > .normal {
350 background-image: -webkit-image-set( 346 background-image: -webkit-image-set(
351 url('../images/media/media_sound_disabled.png') 1x, 347 url('../images/media/media_sound_disabled.png') 1x,
352 url('../images/media/2x/media_sound_disabled.png') 2x); 348 url('../images/media/2x/media_sound_disabled.png') 2x);
353 } 349 }
354 350
355 .media-button.sound[level='0'] > .hover { 351 .media-button.sound[level='0'] > .hover {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 .media-button.sound > .disabled { 421 .media-button.sound > .disabled {
426 background-image: -webkit-image-set( 422 background-image: -webkit-image-set(
427 url('../images/media/media_sound_full_disabled.png') 1x, 423 url('../images/media/media_sound_full_disabled.png') 1x,
428 url('../images/media/2x/media_sound_full_disabled.png') 2x); 424 url('../images/media/2x/media_sound_full_disabled.png') 2x);
429 } 425 }
430 426
431 /* Volume slider. */ 427 /* Volume slider. */
432 428
433 .custom-slider.volume { 429 .custom-slider.volume {
434 height: 100%; 430 height: 100%;
435 margin-left: -4px;
436 margin-right: -4px;
437 position: relative; 431 position: relative;
438 width: 60px; 432 width: 60px;
439 } 433 }
440 434
441 .custom-slider.volume > input[type='range']::-webkit-slider-thumb { 435 .custom-slider.volume > input[type='range']::-webkit-slider-thumb {
442 background-image: -webkit-image-set( 436 background-image: -webkit-image-set(
443 url('../images/media/media_volume_slider_thumb.png') 1x, 437 url('../images/media/media_volume_slider_thumb.png') 1x,
444 url('../images/media/2x/media_volume_slider_thumb.png') 2x); 438 url('../images/media/2x/media_volume_slider_thumb.png') 2x);
445 width: 20px; 439 width: 20px;
446 } 440 }
(...skipping 24 matching lines...) Expand all
471 .video-controls { 465 .video-controls {
472 -webkit-box-align: center; 466 -webkit-box-align: center;
473 -webkit-box-orient: horizontal; 467 -webkit-box-orient: horizontal;
474 -webkit-box-pack: center; 468 -webkit-box-pack: center;
475 background: #202020; 469 background: #202020;
476 border-radius: 5px; 470 border-radius: 5px;
477 display: -webkit-box; 471 display: -webkit-box;
478 font-size: 15px; 472 font-size: 15px;
479 height: 30px; 473 height: 30px;
480 opacity: 0.8; 474 opacity: 0.8;
481 padding-left: 15px;
482 padding-right: 15px;
483 pointer-events: auto; 475 pointer-events: auto;
484 } 476 }
485 477
486 .video-controls .time-controls, 478 /* Cast button. */
487 .video-controls .volume-controls { 479
488 margin-left: 15px; 480 .media-button.cast > .default.normal {
481 background-image: -webkit-image-set(
482 url('../images/media/media_chromecast.png') 1x,
483 url('../images/media/2x/media_chromecast.png') 2x);
489 } 484 }
490 485
486 .media-button.cast > .default.hover {
487 background-image: -webkit-image-set(
488 url('../images/media/media_chromecast_hover.png') 1x,
489 url('../images/media/2x/media_chromecast_hover.png') 2x);
490 }
491
492 .media-button.cast > .default.active {
493 background-image: -webkit-image-set(
494 url('../images/media/media_chromecast_down.png') 1x,
495 url('../images/media/2x/media_chromecast_down.png') 2x);
496 }
497
498 #video-player[casting] .media-button.cast > .default.normal {
499 background-image: -webkit-image-set(
500 url('../images/media/media_chromecast_casting.png') 1x,
501 url('../images/media/2x/media_chromecast_casting.png') 2x);
502 }
503
504 #video-player[casting] .media-button.cast > .default.hover {
505 background-image: -webkit-image-set(
506 url('../images/media/media_chromecast_casting_hover.png') 1x,
507 url('../images/media/2x/media_chromecast_casting_hover.png') 2x);
508 }
509
510 #video-player[casting] .media-button.cast > .default.active {
511 background-image: -webkit-image-set(
512 url('../images/media/media_chromecast_casting_down.png') 1x,
513 url('../images/media/2x/media_chromecast_casting_down.png') 2x);
514 }
515
516 .media-button.cast {
517 display: none;
518 }
519
520 #video-player[cast-available][castable] .media-button.cast {
521 display: block;
522 }
523
524
491 /* Fullscreen button. */ 525 /* Fullscreen button. */
492 /* There is no final decision whether we need a separate icon when toggled. */ 526 /* There is no final decision whether we need a separate icon when toggled. */
493 527
494 .media-button.fullscreen {
495 margin-left: 9px; /* 15px visible margin - 6px whitespace in the icon. */
496 margin-right: -6px;
497 }
498
499 .media-button.fullscreen > .normal { 528 .media-button.fullscreen > .normal {
500 background-image: -webkit-image-set( 529 background-image: -webkit-image-set(
501 url('../images/media/media_fullscreen.png') 1x, 530 url('../images/media/media_fullscreen.png') 1x,
502 url('../images/media/2x/media_fullscreen.png') 2x); 531 url('../images/media/2x/media_fullscreen.png') 2x);
503 } 532 }
504 533
505 .media-button.fullscreen > .hover { 534 .media-button.fullscreen > .hover {
506 background-image: -webkit-image-set( 535 background-image: -webkit-image-set(
507 url('../images/media/media_fullscreen_hover.png') 1x, 536 url('../images/media/media_fullscreen_hover.png') 1x,
508 url('../images/media/2x/media_fullscreen_hover.png') 2x); 537 url('../images/media/2x/media_fullscreen_hover.png') 2x);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 url('../images/media/media_play.png') 1x, 629 url('../images/media/media_play.png') 1x,
601 url('../images/media/2x/media_play.png') 2x); 630 url('../images/media/2x/media_play.png') 2x);
602 } 631 }
603 632
604 .playback-state-icon[state='pause'] { 633 .playback-state-icon[state='pause'] {
605 -webkit-animation: blowup 500ms; 634 -webkit-animation: blowup 500ms;
606 background-image: -webkit-image-set( 635 background-image: -webkit-image-set(
607 url('../images/media/media_pause.png') 1x, 636 url('../images/media/media_pause.png') 1x,
608 url('../images/media/2x/media_pause.png') 2x); 637 url('../images/media/2x/media_pause.png') 2x);
609 } 638 }
OLDNEW
« no previous file with comments | « ui/file_manager/video_player/css/header.css ('k') | ui/file_manager/video_player/images/100/cast_off.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698