Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: skin/options.css

Issue 6088024630755328: issue 1526 - Implement new options page design for Chrome/Opera/Safari (Closed)
Left Patch Set: Created March 6, 2015, 11:44 a.m.
Right Patch Set: Comment about solution being temprorary is added to subscriptions.xml Created June 13, 2015, 12:59 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « options.js ('k') | skin/options-sprite.png » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } 42 }
43 43
44 hr 44 hr
45 { 45 {
46 background-color: #CDCDCD; 46 background-color: #CDCDCD;
47 border: 0px; 47 border: 0px;
48 height: 1px; 48 height: 1px;
49 margin: 0px; 49 margin: 0px;
50 } 50 }
51 51
52 input[type="search"]::-webkit-search-cancel-button
53 {
54 display: none;
55 }
56
52 .option-name 57 .option-name
53 { 58 {
54 display: flex; 59 display: flex;
55 } 60 }
56 61
57 .option-name > * 62 .option-name > *
58 { 63 {
59 -moz-margin-end: 6px; 64 -moz-margin-end: 6px;
60 -webkit-margin-end: 6px; 65 -webkit-margin-end: 6px;
61 } 66 }
62 67
63 #nav-sidebar 68 #nav-sidebar
64 { 69 {
65 position: relative; 70 position: relative;
66 padding: 0px 0px 16px 0px; 71 padding: 0px 0px 16px 0px;
67 -moz-padding-start: 10px; 72 -moz-padding-start: 10px;
68 -webkit-padding-start: 10px; 73 -webkit-padding-start: 10px;
69 min-width: 198px; 74 min-width: 198px;
70 } 75 }
71 76
72 #nav-sidebar .fixed 77 #nav-sidebar .fixed
73 { 78 {
74 height: 100%; 79 height: 100%;
75 position: fixed; 80 position: fixed;
76 }
77
78 #blocking-languages,
79 #acceptable-ads
80 {
81 -moz-padding-end: 40px;
82 -webkit-padding-end: 40px;
83 } 81 }
84 82
85 #page-title 83 #page-title
86 { 84 {
87 -webkit-margin-start: 10px; 85 -webkit-margin-start: 10px;
88 -moz-margin-start: 10px; 86 -moz-margin-start: 10px;
89 } 87 }
90 88
91 #page-title p 89 #page-title p
92 { 90 {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 display: inline-block; 319 display: inline-block;
322 width: 30%; 320 width: 30%;
323 } 321 }
324 322
325 .table.cols .col-name span:first-child 323 .table.cols .col-name span:first-child
326 { 324 {
327 -webkit-padding-start: 38px; 325 -webkit-padding-start: 38px;
328 -moz-padding-start: 38px; 326 -moz-padding-start: 38px;
329 } 327 }
330 328
331 #custom-wrapper
332 {
333 width: 400px;
334 height: 290px;
335 overflow: auto;
336 }
337
338 #custom-wrapper .table
339 {
340 width: 100%;
341 }
342
343 .table::-webkit-scrollbar, 329 .table::-webkit-scrollbar,
344 #custom-wrapper::-webkit-scrollbar 330 #custom-wrapper::-webkit-scrollbar
345 { 331 {
346 -webkit-padding-end: 10px; 332 -webkit-padding-end: 10px;
347 width: 5px; 333 width: 5px;
348 } 334 }
349 335
350 .table::-webkit-scrollbar-thumb, 336 .table::-webkit-scrollbar-thumb,
351 #custom-wrapper::-webkit-scrollbar-thumb 337 #custom-wrapper::-webkit-scrollbar-thumb
352 { 338 {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 415
430 .tabs.horizontal li.active 416 .tabs.horizontal li.active
431 { 417 {
432 border-bottom: 2px solid #1E8728; 418 border-bottom: 2px solid #1E8728;
433 color: black; 419 color: black;
434 font-weight: bold; 420 font-weight: bold;
435 padding-bottom: 10px; 421 padding-bottom: 10px;
436 } 422 }
437 423
438 .icon, .table input[type="checkbox"]::before, .table button.delete, 424 .icon, .table input[type="checkbox"]::before, .table button.delete,
439 #content-help a::before, #modal-close::before 425 #content-help a::before, #dialog-close::before
440 { 426 {
441 background-image: url(options-sprite.png); 427 background-image: url(options-sprite.png);
442 display: inline-block; 428 display: inline-block;
443 } 429 }
444 430
445 .icon-add 431 .icon-add
446 { 432 {
447 background-position: -0px -0px; 433 background-position: -0px -0px;
448 cursor: pointer; 434 cursor: pointer;
449 height: 18px; 435 height: 18px;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 -webkit-padding-start: 16px; 471 -webkit-padding-start: 16px;
486 position: relative; 472 position: relative;
487 } 473 }
488 474
489 .controls > div 475 .controls > div
490 { 476 {
491 display: flex; 477 display: flex;
492 } 478 }
493 479
494 .controls button, 480 .controls button,
495 #modal-close 481 #dialog-close
496 { 482 {
497 background: none; 483 background: none;
498 border: none; 484 border: none;
499 cursor: pointer; 485 cursor: pointer;
500 display: block; 486 display: block;
501 padding: 0; 487 padding: 0;
502 } 488 }
503 489
504 .controls button span:not(.icon) 490 .controls button span:not(.icon)
505 { 491 {
506 color: #3A7BA6; 492 color: #3A7BA6;
507 display: inline-block; 493 display: inline-block;
508 -moz-margin-start: 15px; 494 -moz-margin-start: 15px;
509 -webkit-margin-start: 15px; 495 -webkit-margin-start: 15px;
510 padding-top: 1px; 496 padding-top: 1px;
511 vertical-align: top; 497 vertical-align: top;
512 } 498 }
513 499
514 /* 500 /*
515 General tab content 501 General tab content
516 */ 502 */
517 503
504 #blocking-languages,
505 #acceptable-ads
506 {
507 -moz-padding-end: 40px;
508 -webkit-padding-end: 40px;
509 }
510
511 #custom-wrapper
512 {
513 width: 400px;
514 height: 290px;
515 overflow: auto;
516 }
517
518 #custom-wrapper .table
519 {
520 width: 100%;
521 }
522
518 #whitelisting .controls 523 #whitelisting .controls
519 { 524 {
520 -moz-padding-start: 12px; 525 -moz-padding-start: 12px;
521 -webkit-padding-start: 12px; 526 -webkit-padding-start: 12px;
522 } 527 }
523 528
524 #whitelisting .controls input[type="text"], 529 #whitelisting .controls input[type="text"]
525 #whitelisting .controls input[type="text"]:focus
526 { 530 {
527 border: 0px; 531 border: 0px;
528 border-bottom: 1px solid #A1A1A1; 532 border-bottom: 1px solid #A1A1A1;
529 -moz-padding-end: 25px; 533 -moz-padding-end: 25px;
530 -webkit-padding-end: 25px; 534 -webkit-padding-end: 25px;
531 -moz-margin-start: 14px; 535 -moz-margin-start: 14px;
532 -webkit-margin-start: 14px; 536 -webkit-margin-start: 14px;
533 outline: 0px; 537 outline: 0px;
534 padding-bottom: 5px; 538 padding-bottom: 5px;
535 vertical-align: text-bottom; 539 vertical-align: text-bottom;
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 vertical-align: top; 690 vertical-align: top;
687 } 691 }
688 692
689 #content-help a::before 693 #content-help a::before
690 { 694 {
691 -moz-margin-end: 6px; 695 -moz-margin-end: 6px;
692 -webkit-margin-end: 6px; 696 -webkit-margin-end: 6px;
693 } 697 }
694 698
695 /* 699 /*
696 Modal 700 Dialog
697 */ 701 */
698 702
699 #modal-background 703 #dialog-background
700 { 704 {
701 display: none; 705 display: none;
702 background-color: white; 706 background-color: white;
703 position: absolute; 707 position: absolute;
704 opacity: 0.7; 708 opacity: 0.7;
705 top: 0px; 709 top: 0px;
706 right: 0px; 710 right: 0px;
707 bottom: 0px; 711 bottom: 0px;
708 left: 0px; 712 left: 0px;
709 z-index: 2; 713 z-index: 2;
710 } 714 }
711 715
712 body[data-modal] #modal-background 716 body[data-dialog] #dialog-background
713 { 717 {
714 display: block; 718 display: block;
715 } 719 }
716 720
717 #modal 721 #dialog
718 { 722 {
719 background-color: #FFFFFF; 723 background-color: #FFFFFF;
720 border: 2px solid #4D9D4B; 724 border: 2px solid #4D9D4B;
721 border-radius: 3px; 725 border-radius: 3px;
722 display: none; 726 display: none;
723 margin: auto; 727 margin: auto;
724 position:absolute; 728 position:absolute;
725 top:100px; 729 top:100px;
726 left: 0px; 730 left: 0px;
727 right: 0px; 731 right: 0px;
728 z-index: 2; 732 z-index: 2;
729 width: 400px; 733 width: 400px;
730 } 734 }
731 735
732 #modal header 736 #dialog header
733 { 737 {
734 background-color: #4D9D4B; 738 background-color: #4D9D4B;
735 display: flex; 739 display: flex;
736 height: 25px; 740 height: 25px;
737 padding: 10px; 741 padding: 10px;
738 } 742 }
739 743
740 #modal-close 744 #dialog-close
741 { 745 {
742 -moz-border-start: 1px solid #25612B; 746 -moz-border-start: 1px solid #25612B;
743 -webkit-border-start: 1px solid #25612B; 747 -webkit-border-start: 1px solid #25612B;
744 color: #0F660F; 748 color: #0F660F;
745 display: inline-block; 749 display: inline-block;
746 height: 20px; 750 height: 20px;
747 font-size: 15px; 751 font-size: 15px;
748 -moz-padding-start: 10px; 752 -moz-padding-start: 10px;
749 -webkit-padding-start: 10px; 753 -webkit-padding-start: 10px;
750 } 754 }
751 755
752 #modal-close::before 756 #dialog-close::before
753 { 757 {
754 background-position: -9px -32px; 758 background-position: -9px -32px;
755 content: ""; 759 content: "";
756 cursor: pointer; 760 cursor: pointer;
757 height: 12px; 761 height: 12px;
758 width: 12px; 762 width: 12px;
759 vertical-align: middle; 763 vertical-align: middle;
760 -moz-margin-end: 6px; 764 -moz-margin-end: 6px;
761 -webkit-margin-end: 6px; 765 -webkit-margin-end: 6px;
762 } 766 }
763 767
764 #modal #modal-body 768 #dialog #dialog-body
765 { 769 {
766 margin: 4px 24px; 770 margin: 4px 24px;
767 } 771 }
768 772
769 #modal h3 773 #dialog h3
770 { 774 {
771 font-size: 14px; 775 font-size: 14px;
772 margin: 0px; 776 margin: 0px;
773 } 777 }
774 778
775 #modal input[type="text"], 779 #dialog input[type="text"],
776 #modal input[type="search"] 780 #dialog input[type="search"]
777 { 781 {
778 -webkit-box-sizing: border-box; 782 -webkit-box-sizing: border-box;
779 -moz-box-sizing: border-box; 783 -moz-box-sizing: border-box;
780 box-sizing: border-box; 784 box-sizing: border-box;
781 font-size: 16px; 785 font-size: 16px;
782 margin-top: 10px; 786 margin-top: 10px;
783 padding: 5px; 787 padding: 5px;
784 width: 100%; 788 width: 100%;
785 } 789 }
786 790
787 #modal .table 791 #dialog .table
788 { 792 {
789 width: 100%; 793 width: 100%;
790 } 794 }
791 795
792 #modal #other-language .table 796 #dialog #other-language .table
793 { 797 {
794 height: 200px; 798 height: 200px;
795 overflow: auto; 799 overflow: auto;
796 } 800 }
797 801
798 #modal .section:not(:first-child) 802 #dialog .section:not(:first-child)
799 { 803 {
800 margin-top: 24px; 804 margin-top: 24px;
801 } 805 }
802 806
803 #modal-title 807 #dialog-title
804 { 808 {
805 -moz-margin-start: 16px; 809 -moz-margin-start: 16px;
806 -webkit-margin-start: 16px; 810 -webkit-margin-start: 16px;
807 flex: 1; 811 flex: 1;
808 font-size: 16px; 812 font-size: 16px;
809 color: #FFFFFF; 813 color: #FFFFFF;
810 } 814 }
811 815
812 #modal-title > span 816 #dialog-title > span
813 { 817 {
814 display: none; 818 display: none;
815 } 819 }
816 820
817 body[data-modal="customlist"] #modal-title-customlist, 821 body[data-dialog="customlist"] #dialog-title-customlist,
818 body[data-modal="language"] #modal-title-language 822 body[data-dialog="language"] #dialog-title-language
819 { 823 {
820 display: inline; 824 display: inline;
821 } 825 }
822 826
823 #modal-body .modal-content-block 827 #dialog-body .dialog-content-block
824 { 828 {
825 padding: 12px 0px; 829 padding: 12px 0px;
826 } 830 }
827 831
828 #modal-body .modal-content 832 #dialog-body .dialog-content
829 { 833 {
830 display: none; 834 display: none;
831 } 835 }
832 836
833 #modal .button-wrapper 837 #dialog .button-wrapper
834 { 838 {
835 background-color: #F5F5F5; 839 background-color: #F5F5F5;
836 margin-top: 8px; 840 margin-top: 8px;
837 padding: 10px 16px; 841 padding: 10px 16px;
838 cursor: pointer; 842 cursor: pointer;
839 width: auto; 843 width: auto;
840 } 844 }
841 845
842 #modal .button-wrapper span:not(.icon) 846 #dialog .button-wrapper span:not(.icon)
843 { 847 {
844 color: #3A7BA6; 848 color: #3A7BA6;
845 display: inline-block; 849 display: inline-block;
846 -moz-margin-start: 15px; 850 -moz-margin-start: 15px;
847 -webkit-margin-start: 15px; 851 -webkit-margin-start: 15px;
848 vertical-align: top; 852 vertical-align: top;
849 } 853 }
850 854
851 body[data-modal="customlist"] #modal-content-customlist, 855 body[data-dialog="customlist"] #dialog-content-customlist,
852 body[data-modal="language"] #modal-content-language, 856 body[data-dialog="language"] #dialog-content-language,
853 body[data-modal] #modal 857 body[data-dialog] #dialog
854 { 858 {
855 display: block; 859 display: block;
856 } 860 }
857 861
858 #other-language .button-add 862 #other-language .button-add
859 { 863 {
860 -webkit-border-end: 1px solid #CDCDCD; 864 -webkit-border-end: 1px solid #CDCDCD;
861 -moz-border-end: 1px solid #CDCDCD; 865 -moz-border-end: 1px solid #CDCDCD;
862 -webkit-padding-end: 10px; 866 -webkit-padding-end: 10px;
863 -moz-padding-end: 10px; 867 -moz-padding-end: 10px;
864 -webkit-padding-start: 0px; 868 -webkit-padding-start: 0px;
865 -moz-padding-start: 0px; 869 -moz-padding-start: 0px;
866 } 870 }
867 871
868 #other-language .display 872 #other-language .display
869 { 873 {
870 -webkit-margin-start: 10px; 874 -webkit-margin-start: 10px;
871 -moz-margin-start: 10px; 875 -moz-margin-start: 10px;
872 } 876 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld