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 12, 2015, 2:01 p.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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 -webkit-padding-start: 10px; 73 -webkit-padding-start: 10px;
74 min-width: 198px; 74 min-width: 198px;
75 } 75 }
76 76
77 #nav-sidebar .fixed 77 #nav-sidebar .fixed
78 { 78 {
79 height: 100%; 79 height: 100%;
80 position: fixed; 80 position: fixed;
81 } 81 }
82 82
83 #blocking-languages,
84 #acceptable-ads
85 {
86 -moz-padding-end: 40px;
87 -webkit-padding-end: 40px;
88 }
89
90 #page-title 83 #page-title
91 { 84 {
92 -webkit-margin-start: 10px; 85 -webkit-margin-start: 10px;
93 -moz-margin-start: 10px; 86 -moz-margin-start: 10px;
94 } 87 }
95 88
96 #page-title p 89 #page-title p
97 { 90 {
98 margin: 0px; 91 margin: 0px;
99 padding: 40px 0px 0px 0px; 92 padding: 40px 0px 0px 0px;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 display: inline-block; 319 display: inline-block;
327 width: 30%; 320 width: 30%;
328 } 321 }
329 322
330 .table.cols .col-name span:first-child 323 .table.cols .col-name span:first-child
331 { 324 {
332 -webkit-padding-start: 38px; 325 -webkit-padding-start: 38px;
333 -moz-padding-start: 38px; 326 -moz-padding-start: 38px;
334 } 327 }
335 328
336 #custom-wrapper
337 {
338 width: 400px;
339 height: 290px;
340 overflow: auto;
341 }
342
343 #custom-wrapper .table
344 {
345 width: 100%;
346 }
347
348 .table::-webkit-scrollbar, 329 .table::-webkit-scrollbar,
349 #custom-wrapper::-webkit-scrollbar 330 #custom-wrapper::-webkit-scrollbar
350 { 331 {
351 -webkit-padding-end: 10px; 332 -webkit-padding-end: 10px;
352 width: 5px; 333 width: 5px;
353 } 334 }
354 335
355 .table::-webkit-scrollbar-thumb, 336 .table::-webkit-scrollbar-thumb,
356 #custom-wrapper::-webkit-scrollbar-thumb 337 #custom-wrapper::-webkit-scrollbar-thumb
357 { 338 {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 415
435 .tabs.horizontal li.active 416 .tabs.horizontal li.active
436 { 417 {
437 border-bottom: 2px solid #1E8728; 418 border-bottom: 2px solid #1E8728;
438 color: black; 419 color: black;
439 font-weight: bold; 420 font-weight: bold;
440 padding-bottom: 10px; 421 padding-bottom: 10px;
441 } 422 }
442 423
443 .icon, .table input[type="checkbox"]::before, .table button.delete, 424 .icon, .table input[type="checkbox"]::before, .table button.delete,
444 #content-help a::before, #modal-close::before 425 #content-help a::before, #dialog-close::before
445 { 426 {
446 background-image: url(options-sprite.png); 427 background-image: url(options-sprite.png);
447 display: inline-block; 428 display: inline-block;
448 } 429 }
449 430
450 .icon-add 431 .icon-add
451 { 432 {
452 background-position: -0px -0px; 433 background-position: -0px -0px;
453 cursor: pointer; 434 cursor: pointer;
454 height: 18px; 435 height: 18px;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 -webkit-padding-start: 16px; 471 -webkit-padding-start: 16px;
491 position: relative; 472 position: relative;
492 } 473 }
493 474
494 .controls > div 475 .controls > div
495 { 476 {
496 display: flex; 477 display: flex;
497 } 478 }
498 479
499 .controls button, 480 .controls button,
500 #modal-close 481 #dialog-close
501 { 482 {
502 background: none; 483 background: none;
503 border: none; 484 border: none;
504 cursor: pointer; 485 cursor: pointer;
505 display: block; 486 display: block;
506 padding: 0; 487 padding: 0;
507 } 488 }
508 489
509 .controls button span:not(.icon) 490 .controls button span:not(.icon)
510 { 491 {
511 color: #3A7BA6; 492 color: #3A7BA6;
512 display: inline-block; 493 display: inline-block;
513 -moz-margin-start: 15px; 494 -moz-margin-start: 15px;
514 -webkit-margin-start: 15px; 495 -webkit-margin-start: 15px;
515 padding-top: 1px; 496 padding-top: 1px;
516 vertical-align: top; 497 vertical-align: top;
517 } 498 }
518 499
519 /* 500 /*
520 General tab content 501 General tab content
Felix Dahlke 2015/06/07 21:09:59 Seems like there's some stuff above that belongs b
saroyanm 2015/06/09 15:29:13 Done.
521 */ 502 */
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 522
523 #whitelisting .controls 523 #whitelisting .controls
524 { 524 {
525 -moz-padding-start: 12px; 525 -moz-padding-start: 12px;
526 -webkit-padding-start: 12px; 526 -webkit-padding-start: 12px;
527 } 527 }
528 528
529 #whitelisting .controls input[type="text"] 529 #whitelisting .controls input[type="text"]
530 { 530 {
531 border: 0px; 531 border: 0px;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 vertical-align: top; 690 vertical-align: top;
691 } 691 }
692 692
693 #content-help a::before 693 #content-help a::before
694 { 694 {
695 -moz-margin-end: 6px; 695 -moz-margin-end: 6px;
696 -webkit-margin-end: 6px; 696 -webkit-margin-end: 6px;
697 } 697 }
698 698
699 /* 699 /*
700 Modal 700 Dialog
701 */ 701 */
702 702
703 #modal-background 703 #dialog-background
704 { 704 {
705 display: none; 705 display: none;
706 background-color: white; 706 background-color: white;
707 position: absolute; 707 position: absolute;
708 opacity: 0.7; 708 opacity: 0.7;
709 top: 0px; 709 top: 0px;
710 right: 0px; 710 right: 0px;
711 bottom: 0px; 711 bottom: 0px;
712 left: 0px; 712 left: 0px;
713 z-index: 2; 713 z-index: 2;
714 } 714 }
715 715
716 body[data-modal] #modal-background 716 body[data-dialog] #dialog-background
717 { 717 {
718 display: block; 718 display: block;
719 } 719 }
720 720
721 #modal 721 #dialog
722 { 722 {
723 background-color: #FFFFFF; 723 background-color: #FFFFFF;
724 border: 2px solid #4D9D4B; 724 border: 2px solid #4D9D4B;
725 border-radius: 3px; 725 border-radius: 3px;
726 display: none; 726 display: none;
727 margin: auto; 727 margin: auto;
728 position:absolute; 728 position:absolute;
729 top:100px; 729 top:100px;
730 left: 0px; 730 left: 0px;
731 right: 0px; 731 right: 0px;
732 z-index: 2; 732 z-index: 2;
733 width: 400px; 733 width: 400px;
734 } 734 }
735 735
736 #modal header 736 #dialog header
737 { 737 {
738 background-color: #4D9D4B; 738 background-color: #4D9D4B;
739 display: flex; 739 display: flex;
740 height: 25px; 740 height: 25px;
741 padding: 10px; 741 padding: 10px;
742 } 742 }
743 743
744 #modal-close 744 #dialog-close
745 { 745 {
746 -moz-border-start: 1px solid #25612B; 746 -moz-border-start: 1px solid #25612B;
747 -webkit-border-start: 1px solid #25612B; 747 -webkit-border-start: 1px solid #25612B;
748 color: #0F660F; 748 color: #0F660F;
749 display: inline-block; 749 display: inline-block;
750 height: 20px; 750 height: 20px;
751 font-size: 15px; 751 font-size: 15px;
752 -moz-padding-start: 10px; 752 -moz-padding-start: 10px;
753 -webkit-padding-start: 10px; 753 -webkit-padding-start: 10px;
754 } 754 }
755 755
756 #modal-close::before 756 #dialog-close::before
757 { 757 {
758 background-position: -9px -32px; 758 background-position: -9px -32px;
759 content: ""; 759 content: "";
760 cursor: pointer; 760 cursor: pointer;
761 height: 12px; 761 height: 12px;
762 width: 12px; 762 width: 12px;
763 vertical-align: middle; 763 vertical-align: middle;
764 -moz-margin-end: 6px; 764 -moz-margin-end: 6px;
765 -webkit-margin-end: 6px; 765 -webkit-margin-end: 6px;
766 } 766 }
767 767
768 #modal #modal-body 768 #dialog #dialog-body
769 { 769 {
770 margin: 4px 24px; 770 margin: 4px 24px;
771 } 771 }
772 772
773 #modal h3 773 #dialog h3
774 { 774 {
775 font-size: 14px; 775 font-size: 14px;
776 margin: 0px; 776 margin: 0px;
777 } 777 }
778 778
779 #modal input[type="text"], 779 #dialog input[type="text"],
780 #modal input[type="search"] 780 #dialog input[type="search"]
781 { 781 {
782 -webkit-box-sizing: border-box; 782 -webkit-box-sizing: border-box;
783 -moz-box-sizing: border-box; 783 -moz-box-sizing: border-box;
784 box-sizing: border-box; 784 box-sizing: border-box;
785 font-size: 16px; 785 font-size: 16px;
786 margin-top: 10px; 786 margin-top: 10px;
787 padding: 5px; 787 padding: 5px;
788 width: 100%; 788 width: 100%;
789 } 789 }
790 790
791 #modal .table 791 #dialog .table
792 { 792 {
793 width: 100%; 793 width: 100%;
794 } 794 }
795 795
796 #modal #other-language .table 796 #dialog #other-language .table
797 { 797 {
798 height: 200px; 798 height: 200px;
799 overflow: auto; 799 overflow: auto;
800 } 800 }
801 801
802 #modal .section:not(:first-child) 802 #dialog .section:not(:first-child)
803 { 803 {
804 margin-top: 24px; 804 margin-top: 24px;
805 } 805 }
806 806
807 #modal-title 807 #dialog-title
808 { 808 {
809 -moz-margin-start: 16px; 809 -moz-margin-start: 16px;
810 -webkit-margin-start: 16px; 810 -webkit-margin-start: 16px;
811 flex: 1; 811 flex: 1;
812 font-size: 16px; 812 font-size: 16px;
813 color: #FFFFFF; 813 color: #FFFFFF;
814 } 814 }
815 815
816 #modal-title > span 816 #dialog-title > span
817 { 817 {
818 display: none; 818 display: none;
819 } 819 }
820 820
821 body[data-modal="customlist"] #modal-title-customlist, 821 body[data-dialog="customlist"] #dialog-title-customlist,
822 body[data-modal="language"] #modal-title-language 822 body[data-dialog="language"] #dialog-title-language
823 { 823 {
824 display: inline; 824 display: inline;
825 } 825 }
826 826
827 #modal-body .modal-content-block 827 #dialog-body .dialog-content-block
828 { 828 {
829 padding: 12px 0px; 829 padding: 12px 0px;
830 } 830 }
831 831
832 #modal-body .modal-content 832 #dialog-body .dialog-content
833 { 833 {
834 display: none; 834 display: none;
835 } 835 }
836 836
837 #modal .button-wrapper 837 #dialog .button-wrapper
838 { 838 {
839 background-color: #F5F5F5; 839 background-color: #F5F5F5;
840 margin-top: 8px; 840 margin-top: 8px;
841 padding: 10px 16px; 841 padding: 10px 16px;
842 cursor: pointer; 842 cursor: pointer;
843 width: auto; 843 width: auto;
844 } 844 }
845 845
846 #modal .button-wrapper span:not(.icon) 846 #dialog .button-wrapper span:not(.icon)
847 { 847 {
848 color: #3A7BA6; 848 color: #3A7BA6;
849 display: inline-block; 849 display: inline-block;
850 -moz-margin-start: 15px; 850 -moz-margin-start: 15px;
851 -webkit-margin-start: 15px; 851 -webkit-margin-start: 15px;
852 vertical-align: top; 852 vertical-align: top;
853 } 853 }
854 854
855 body[data-modal="customlist"] #modal-content-customlist, 855 body[data-dialog="customlist"] #dialog-content-customlist,
856 body[data-modal="language"] #modal-content-language, 856 body[data-dialog="language"] #dialog-content-language,
857 body[data-modal] #modal 857 body[data-dialog] #dialog
858 { 858 {
859 display: block; 859 display: block;
860 } 860 }
861 861
862 #other-language .button-add 862 #other-language .button-add
863 { 863 {
864 -webkit-border-end: 1px solid #CDCDCD; 864 -webkit-border-end: 1px solid #CDCDCD;
865 -moz-border-end: 1px solid #CDCDCD; 865 -moz-border-end: 1px solid #CDCDCD;
866 -webkit-padding-end: 10px; 866 -webkit-padding-end: 10px;
867 -moz-padding-end: 10px; 867 -moz-padding-end: 10px;
868 -webkit-padding-start: 0px; 868 -webkit-padding-start: 0px;
869 -moz-padding-start: 0px; 869 -moz-padding-start: 0px;
870 } 870 }
871 871
872 #other-language .display 872 #other-language .display
873 { 873 {
874 -webkit-margin-start: 10px; 874 -webkit-margin-start: 10px;
875 -moz-margin-start: 10px; 875 -moz-margin-start: 10px;
876 } 876 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld