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

Side by Side Diff: chrome/browser/resources/options/options_page.css

Issue 10907148: Implement popup bubbles for the controlled setting indicator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reimplemented on top of newly refactored BubbleBase class. Created 8 years, 3 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 | Annotate | Revision Log
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 body { 5 body {
6 position: relative; 6 position: relative;
7 } 7 }
8 8
9 #main-content { 9 #main-content {
10 bottom: 0; 10 bottom: 0;
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 /* If the Flash plug-in supports the NPP_ClearSiteData API, we don't need to 445 /* If the Flash plug-in supports the NPP_ClearSiteData API, we don't need to
446 * show the link to the Flash storage settings manager: 446 * show the link to the Flash storage settings manager:
447 */ 447 */
448 html[flashPluginSupportsClearSiteData] .flash-plugin-area, 448 html[flashPluginSupportsClearSiteData] .flash-plugin-area,
449 html:not([flashPluginSupportsClearSiteData]) .clear-plugin-lso-data-enabled, 449 html:not([flashPluginSupportsClearSiteData]) .clear-plugin-lso-data-enabled,
450 html[flashPluginSupportsClearSiteData] .clear-plugin-lso-data-disabled, 450 html[flashPluginSupportsClearSiteData] .clear-plugin-lso-data-disabled,
451 html:not([enablePepperFlashSettings]) .pepper-flash-settings { 451 html:not([enablePepperFlashSettings]) .pepper-flash-settings {
452 display: none; 452 display: none;
453 } 453 }
454 454
455 /* Controlled setting indicator and bubble. */ 455 /* Bubble. */
456 .controlled-setting-indicator { 456
457 display: inline-block; 457 .options-bubble {
458 /* Establish a containing block for absolutely positioning the bubble. */ 458 position: fixed;
459 position: relative;
460 vertical-align: text-bottom;
461 } 459 }
462 460
463 .controlled-setting-indicator[controlled-by] summary { 461 /* Controlled setting indicator and bubble. */
464 background-size: contain; 462
463 .controlled-setting-indicator {
464 display: none;
465 }
466
467 .controlled-setting-indicator[controlled-by] {
468 display: inline-block;
465 height: 16px; 469 height: 16px;
470 vertical-align: text-bottom;
466 width: 16px; 471 width: 16px;
kevers 2012/09/20 17:50:42 Probably also need "background-size: 16px" here.
467 } 472 }
468 473
469 .controlled-setting-indicator summary::-webkit-details-marker { 474 .controlled-setting-indicator[controlled-by='policy'] {
470 display: none; 475 background-image:
476 url('chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY_GRAY');
471 } 477 }
472 478
473 .controlled-setting-indicator[controlled-by='policy'] summary { 479 .controlled-setting-indicator[controlled-by='policy']:hover,
480 .controlled-setting-indicator[controlled-by='policy'][is-showing-bubble] {
474 background-image: 481 background-image:
475 url('chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY_GRAY'); 482 url('chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY');
476 background-size: 16px;
kevers 2012/09/20 17:50:42 The background-size attributes are required for hi
bartfab (slow) 2012/09/20 18:34:12 I tried this out with a Linux Chrome OS build and
flackr 2012/09/20 20:00:53 Yes, this is the intended behaviour. The reason fo
bartfab (slow) 2012/09/20 21:54:17 Thanks for clarifying - learn something new every
flackr 2012/09/20 22:15:25 Yes, that's sufficient. Thanks!
477 } 483 }
478 484
479 .controlled-setting-indicator[controlled-by='policy'] summary:hover { 485 .controlled-setting-indicator[controlled-by='extension'] {
480 background-image: 486 background-image:
481 url('chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY'); 487 url('chrome://theme/IDR_CONTROLLED_SETTING_EXTENSION_GRAY');
482 background-size: 16px;
483 } 488 }
484 489
485 .controlled-setting-indicator[controlled-by='extension'] summary { 490 .controlled-setting-indicator[controlled-by='extension']:hover,
491 .controlled-setting-indicator[controlled-by='extension'][is-showing-bubble] {
486 background-image: 492 background-image:
487 url('chrome://theme/IDR_CONTROLLED_SETTING_EXTENSION_GRAY'); 493 url('chrome://theme/IDR_CONTROLLED_SETTING_EXTENSION');
488 background-size: 16px;
489 } 494 }
490 495
491 .controlled-setting-indicator[controlled-by='extension'] summary:hover { 496 .controlled-setting-indicator[controlled-by='recommended'] {
492 background-image: 497 background-image:
493 url('chrome://theme/IDR_CONTROLLED_SETTING_EXTENSION'); 498 url('chrome://theme/IDR_CONTROLLED_SETTING_RECOMMENDED_GRAY');
494 background-size: 16px;
495 } 499 }
496 500
497 .controlled-setting-indicator[controlled-by='recommended'] summary { 501 .controlled-setting-indicator[controlled-by='recommended']:hover,
502 .controlled-setting-indicator[controlled-by='recommended'][is-showing-bubble] {
498 background-image: 503 background-image:
499 url('chrome://theme/IDR_CONTROLLED_SETTING_RECOMMENDED_GRAY'); 504 url('chrome://theme/IDR_CONTROLLED_SETTING_RECOMMENDED');
500 background-size: 16px;
501 } 505 }
502 506
503 .controlled-setting-indicator[controlled-by='recommended'] summary:hover { 507 .controlled-setting-bubble-content {
504 background-image: 508 -webkit-padding-start: 30px;
505 url('chrome://theme/IDR_CONTROLLED_SETTING_RECOMMENDED'); 509 background-repeat: no-repeat;
506 background-size: 16px; 510 background-size: 22px;
511 min-height: 32px;
507 } 512 }
508 513
509 .controlled-setting-bubble { 514 .controlled-setting-bubble-content[controlled-by='policy'] {
510 -webkit-margin-start: -20px; 515 background-image:
511 background-color: white; 516 url('chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY_LARGE');
512 border: 1px solid #ccc;
513 border-radius: 4px;
514 box-shadow: 0 2px 2px #ddd;
515 margin-top: 10px;
516 padding: 10px;
517 position: absolute;
518 top: 50%;
519 z-index: 10;
520 } 517 }
521 518
522 html[dir='ltr'] .controlled-setting-bubble { 519 .controlled-setting-bubble-content[controlled-by='extension'] {
523 left: 50%; 520 background-image:
521 url('chrome://theme/IDR_CONTROLLED_SETTING_EXTENSION_LARGE');
524 } 522 }
525 523
526 html[dir='rtl'] .controlled-setting-bubble { 524 .controlled-setting-bubble-content[controlled-by='recommended'] {
527 right: 50%; 525 background-image:
526 url('chrome://theme/IDR_CONTROLLED_SETTING_RECOMMENDED_LARGE');
528 } 527 }
529 528
530 .controlled-setting-bubble::before { 529 html[dir='rtl'] .controlled-setting-bubble-content {
531 -webkit-margin-start: 4px;
532 border-color: #ccc transparent;
533 border-style: solid;
534 border-width: 0 5px 5px;
535 content: '';
536 position: absolute;
537 top: -5px;
538 }
539
540 .controlled-setting-bubble::after {
541 -webkit-margin-start: 5px;
542 border-color: white transparent;
543 border-style: solid;
544 border-width: 0 4px 4px;
545 content: '';
546 position: absolute;
547 top: -4px;
548 }
549
550 .controlled-setting-bubble-text {
551 -webkit-padding-start: 30px;
552 background-repeat: no-repeat;
553 margin: 0;
554 min-height: 32px;
555 min-width: 200px;
556 }
557
558 .controlled-setting-indicator[controlled-by='policy']
559 .controlled-setting-bubble-text {
560 background-image:
561 url('chrome://theme/IDR_CONTROLLED_SETTING_MANDATORY_LARGE');
562 background-size: 22px;
563 }
564
565 .controlled-setting-indicator[controlled-by='extension']
566 .controlled-setting-bubble-text {
567 background-image:
568 url('chrome://theme/IDR_CONTROLLED_SETTING_EXTENSION_LARGE');
569 background-size: 22px;
570 }
571
572 .controlled-setting-indicator[controlled-by='recommended']
573 .controlled-setting-bubble-text {
574 background-image:
575 url('chrome://theme/IDR_CONTROLLED_SETTING_RECOMMENDED_LARGE');
576 background-size: 22px;
577 }
578
579 html[dir='rtl'] .controlled-setting-bubble-text {
580 background-position: right top; 530 background-position: right top;
581 } 531 }
582 532
583 .controlled-setting-bubble-action { 533 .controlled-setting-bubble-action {
584 padding: 0 !important; 534 padding: 0 !important;
585 } 535 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options_bundle.js ('k') | chrome/browser/resources/options/options_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698