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

Side by Side Diff: skin/options.css

Issue 29336364: issue 2377 - Finish design of Advanced tab of new options page (Closed)
Patch Set: Created Feb. 15, 2016, 12:29 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 body 48 body
49 { 49 {
50 background-color: #F5F5F5; 50 background-color: #F5F5F5;
51 display: flex; 51 display: flex;
52 margin: 20px 10px; 52 margin: 20px 10px;
53 font-family: "Source Sans Pro", sans-serif; 53 font-family: "Source Sans Pro", sans-serif;
54 font-size: 14px; 54 font-size: 14px;
55 } 55 }
56 56
57 h1 57 h1
58 { 58 {
59 font-size: 24px; 59 font-size: 24px;
60 line-height: 1em; 60 line-height: 1em;
61 font-weight: 300; 61 font-weight: 300;
62 } 62 }
63 63
64 h2 64 h2
65 { 65 {
66 font-size: 16px; 66 font-size: 16px;
67 font-weight: 600; 67 font-weight: 600;
(...skipping 10 matching lines...) Expand all
78 border: 0px; 78 border: 0px;
79 height: 1px; 79 height: 1px;
80 margin: 0px; 80 margin: 0px;
81 } 81 }
82 82
83 input[type="search"]::-webkit-search-cancel-button 83 input[type="search"]::-webkit-search-cancel-button
84 { 84 {
85 display: none; 85 display: none;
86 } 86 }
87 87
88 input[type="text"], input[type="search"] 88 input[type="text"],
89 input[type="search"],
90 textarea
89 { 91 {
90 -webkit-box-sizing: border-box; 92 -webkit-box-sizing: border-box;
91 -moz-box-sizing: border-box; 93 -moz-box-sizing: border-box;
92 box-sizing: border-box; 94 box-sizing: border-box;
93 } 95 }
94 96
95 button[role="checkbox"] 97 button[role="checkbox"]
96 { 98 {
97 vertical-align: top; 99 vertical-align: top;
98 width: 18px; 100 width: 18px;
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 font-size: 12px; 414 font-size: 12px;
413 -moz-padding-end: 12px; 415 -moz-padding-end: 12px;
414 -webkit-padding-end: 12px; 416 -webkit-padding-end: 12px;
415 } 417 }
416 418
417 .tabs.horizontal 419 .tabs.horizontal
418 { 420 {
419 display: flex; 421 display: flex;
420 margin-bottom: 0px; 422 margin-bottom: 0px;
421 padding: 0px; 423 padding: 0px;
424 border-bottom: 1px solid #A1A1A1;
422 } 425 }
423 426
424 .tabs.horizontal li 427 .tabs.horizontal li
425 { 428 {
426 display: inline-block; 429 display: inline-block;
427 border-bottom: 1px solid #A1A1A1;
428 padding: 10px 46px; 430 padding: 10px 46px;
429 color: #3A7BA6; 431 color: #3A7BA6;
430 text-align: center; 432 text-align: center;
431 } 433 }
432 434
433 .icon, 435 .icon,
434 button[role="checkbox"], 436 button[role="checkbox"],
435 .table button.delete, 437 .table button.delete,
436 #content-help a::before, 438 #content-help a::before,
437 #dialog-close::before, 439 #dialog-close::before,
438 #custom-filters-add button::after, 440 #custom-filters-add button::after,
439 #dialog-body button::before, 441 #dialog-body button::before,
440 .date::before, 442 .date::before,
441 .time::before, 443 .time::before,
442 #all-filter-lists .arrow, 444 #all-filter-lists .arrow,
443 .context-menu .content a::before 445 .context-menu .content a::before
444 { 446 {
445 background-image: url(options-sprite.png); 447 background-image: url(options-sprite.png);
446 display: inline-block; 448 display: inline-block;
447 } 449 }
448 450
449 .icon-add 451 .icon-add
450 { 452 {
451 background-position: -0px -0px; 453 background-position: -0px -0px;
452 cursor: pointer; 454 cursor: pointer;
453 height: 18px; 455 height: 18px;
454 min-width: 18px; 456 min-width: 18px;
455 } 457 }
456 458
459 .icon-save
460 {
461 background-position: 0px -61px;
462 cursor: pointer;
463 height: 18px;
464 width: 18px;
Thomas Greiner 2016/02/15 18:09:22 Those two icons are 10x10 pixels so let's not have
saroyanm 2016/02/24 11:23:57 Fair enough, done.
465 }
466
467 .icon-cancel
468 {
469 background-position: -18px -61px;
470 cursor: pointer;
471 height: 18px;
472 width: 18px;
Thomas Greiner 2016/02/15 18:09:21 Would be nice if we could remove all those duplica
saroyanm 2016/02/24 11:23:58 Sure, hopefully I could organize the code better.
473 }
474
457 .icon-update 475 .icon-update
458 { 476 {
459 background-position: -34px -0px; 477 background-position: -34px -0px;
460 cursor: pointer; 478 cursor: pointer;
461 height: 18px; 479 height: 18px;
462 width: 18px; 480 width: 18px;
463 } 481 }
464 482
465 .icon-edit 483 .icon-edit
466 { 484 {
(...skipping 11 matching lines...) Expand all
478 cursor: pointer; 496 cursor: pointer;
479 height: 11px; 497 height: 11px;
480 vertical-align: middle; 498 vertical-align: middle;
481 width: 7px; 499 width: 7px;
482 -moz-margin-end: 12px; 500 -moz-margin-end: 12px;
483 -webkit-margin-end: 12px; 501 -webkit-margin-end: 12px;
484 } 502 }
485 503
486 .controls 504 .controls
487 { 505 {
506 position: relative;
Thomas Greiner 2016/02/15 18:09:23 Detail: I know that you merely moved this but I'm
saroyanm 2016/02/24 11:23:58 Yes, neither can't see a reason. Done.
488 border-top: 1px solid #CDCDCD; 507 border-top: 1px solid #CDCDCD;
489 padding-top: 8px; 508 padding-top: 14px;
490 -moz-padding-start: 16px; 509 -moz-padding-start: 16px;
491 -webkit-padding-start: 16px; 510 -webkit-padding-start: 16px;
Thomas Greiner 2016/02/15 18:09:22 Detail: According to the style guide there should
saroyanm 2016/02/24 11:23:58 Done, I also changed the implementation so we don'
492 position: relative;
493 } 511 }
494 512
495 .controls > div 513 .controls > div
496 { 514 {
497 display: flex; 515 display: flex;
498 } 516 }
499 517
500 .controls button, 518 .controls button,
501 #dialog-close 519 #dialog-close
502 { 520 {
503 background: none; 521 background: none;
504 border: none; 522 border: none;
505 cursor: pointer; 523 cursor: pointer;
506 display: block; 524 display: block;
507 padding: 0; 525 padding: 0;
508 } 526 }
509 527
510 .controls button span:not(.icon) 528 .controls button span:not(.icon)
Thomas Greiner 2016/02/15 18:09:22 Detail: The button text is smaller than `14px`.
saroyanm 2016/02/24 11:23:58 Not really sure, according to styleguide -> https
511 { 529 {
530 display: inline-block;
531 -moz-margin-start: 16px;
532 -webkit-margin-start: 16px;
533 padding-top: 1px;
512 color: #3A7BA6; 534 color: #3A7BA6;
513 display: inline-block;
514 -moz-margin-start: 15px;
515 -webkit-margin-start: 15px;
516 padding-top: 1px;
517 vertical-align: top; 535 vertical-align: top;
518 } 536 }
519 537
520 /* 538 /*
521 General tab content 539 General tab content
522 */ 540 */
523 541
524 #blocking-languages, 542 #blocking-languages,
525 #acceptable-ads 543 #acceptable-ads
526 { 544 {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 background-color: transparent; 617 background-color: transparent;
600 border: 0px; 618 border: 0px;
601 color: #3A7BA6; 619 color: #3A7BA6;
602 cursor: pointer; 620 cursor: pointer;
603 } 621 }
604 622
605 /* 623 /*
606 Advanced tab content 624 Advanced tab content
607 */ 625 */
608 626
627 h1.with-description,
628 h3.with-description
Thomas Greiner 2016/02/15 18:09:21 Why is this necessary? Seems like you should be ab
saroyanm 2016/02/24 11:23:58 I did it for the reason of the RTL positioning in
629 {
630 display: flex;
631 align-items: baseline;
632 }
633
634 #tweaks
635 {
636 margin-top: 18px;
Thomas Greiner 2016/02/15 18:09:22 It seems like this margin is the same for each `h1
saroyanm 2016/02/24 11:23:58 Done, but not sure does it make sense to remove pa
637 }
638
639 #tweaks li
640 {
641 padding-top: 6px;
642 padding-bottom: 6px;
Thomas Greiner 2016/02/15 18:09:22 Can't you make this a bit more generic? I noticed
saroyanm 2016/02/24 11:23:58 Done.
643 }
644
609 #filter-lists > div 645 #filter-lists > div
610 { 646 {
611 display: none; 647 display: none;
612 } 648 }
613 649
614 body[data-tab="advanced-allFilterLists"] #all-filter-lists, 650 body[data-tab="advanced-allFilterLists"] #all-filter-lists,
615 body[data-tab="advanced-customFilters"] #custom-filters 651 body[data-tab="advanced-customFilters"] #custom-filters
616 { 652 {
617 display: block; 653 display: block;
618 } 654 }
(...skipping 17 matching lines...) Expand all
636 padding-left: 16px; 672 padding-left: 16px;
637 padding-right: 16px; 673 padding-right: 16px;
638 } 674 }
639 675
640 #all-filter-lists .table li > div 676 #all-filter-lists .table li > div
641 { 677 {
642 display: flex; 678 display: flex;
643 width: 330px; 679 width: 330px;
644 } 680 }
645 681
682 #own-filter-list span:first-child
683 {
684 font-weight: 600;
685 }
Thomas Greiner 2016/02/15 18:09:22 Detail: Wouldn't it be simpler to replace the `<sp
saroyanm 2016/02/24 11:23:58 Makes much more sense, done, I removed the ID, but
686
646 .table-header 687 .table-header
647 { 688 {
648 display: flex; 689 display: flex;
649 } 690 }
650 691
651 #filter-lists h3 692 #filter-lists h3
Thomas Greiner 2016/02/15 18:09:22 I noticed that we decided to move the "read more"
saroyanm 2016/02/24 11:23:57 Well there we do have two section next to each oth
652 { 693 {
653 display: inline-block;
654 margin-bottom: 7px; 694 margin-bottom: 7px;
655 font-size: 14px; 695 font-size: 16px;
Thomas Greiner 2016/02/15 18:09:22 Detail: Why not make this apply globally for all `
saroyanm 2016/02/24 11:23:58 My fault, according to the styleguid, we do not ha
656 } 696 }
657 697
658 .table-header h3:first-child 698 .table-header h3:first-child
659 { 699 {
660 width: 330px; 700 width: 330px;
661 -webkit-padding-start: 54px; 701 -webkit-padding-start: 54px;
662 -moz-padding-start: 54px; 702 -moz-padding-start: 54px;
663 } 703 }
664 704
665 #all-filter-lists .table li span.display 705 #all-filter-lists .table li span.display
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 -moz-margin-end: 6px; 773 -moz-margin-end: 6px;
734 -webkit-margin-start: 12px; 774 -webkit-margin-start: 12px;
735 -moz-margin-start: 12px; 775 -moz-margin-start: 12px;
736 height: 12px; 776 height: 12px;
737 width: 12px; 777 width: 12px;
738 background-position: -20px -49px; 778 background-position: -20px -49px;
739 } 779 }
740 780
741 #custom-filters-header 781 #custom-filters-header
742 { 782 {
743 padding: 0px 20px; 783 padding: 0px 16px;
744 margin-bottom: 10px; 784 margin-bottom: 10px;
745 } 785 }
746 786
747 #custom-filters-raw-controls 787 #custom-filters-raw-controls
748 { 788 {
749 display: flex; 789 display: flex;
Thomas Greiner 2016/02/15 18:09:22 Detail: This seems redundant because `.controls >
saroyanm 2016/02/24 11:23:59 Done.
790 justify-content: space-between;
750 } 791 }
751 792
752 #custom-filters:not(.mode-edit) #custom-filters-raw, 793 #custom-filters:not(.mode-edit) #custom-filters-raw,
753 #custom-filters:not(.mode-edit) #custom-filters-raw-controls, 794 #custom-filters:not(.mode-edit) #custom-filters-raw-controls,
754 #custom-filters.mode-edit #custom-filters-show-edit, 795 #custom-filters.mode-edit #custom-filters-show-edit,
755 #custom-filters.mode-edit #custom-filters-list-wrapper 796 #custom-filters.mode-edit #custom-filters-list-wrapper
756 { 797 {
757 display: none; 798 display: none;
758 } 799 }
759 800
760 #custom-filters-raw-save
761 {
762 padding: 0px 16px;
763 }
764
765 #custom-filters .table 801 #custom-filters .table
766 { 802 {
767 height: 290px; 803 height: 290px;
768 overflow: auto; 804 overflow: auto;
769 width: auto; 805 width: auto;
770 } 806 }
771 807
772 #custom-filters-add 808 #custom-filters-add
773 { 809 {
774 display: flex; 810 display: flex;
775 padding: 0px; 811 padding: 0px;
776 border: none; 812 border: none;
777 } 813 }
778 814
779 #custom-filters .controls 815 #custom-filters .controls
780 { 816 {
781 border-top: none; 817 border-top: none;
782 } 818 }
783 819
784 #custom-filters-raw 820 #custom-filters-raw
785 { 821 {
786 width: 100%; 822 width: 100%;
787 height: 100%; 823 height: 100%;
824 -moz-padding-start: 16px;
825 -webkit-padding-start: 16px;
Thomas Greiner 2016/02/15 18:09:22 Detail: Any reason why you're only setting the pad
saroyanm 2016/02/24 11:23:58 Done.
788 } 826 }
789 827
790 #custom-filters-wrapper 828 #custom-filters-wrapper
791 { 829 {
792 height: 330px; 830 height: 330px;
793 } 831 }
794 832
795 #custom-filters input[type="text"] 833 #custom-filters input[type="text"]
796 { 834 {
797 border-width: 1px 0px 1px 0px; 835 border-width: 1px 0px 1px 0px;
798 border-bottom-style: solid; 836 border-bottom-style: solid;
799 border-top-style: solid; 837 border-top-style: solid;
800 border-color: #1E8728; 838 border-color: #1E8728;
801 height: 25px; 839 height: 25px;
802 -moz-padding-start: 10px; 840 -moz-padding-start: 16px;
803 -webkit-padding-start: 10px; 841 -webkit-padding-start: 16px;
804 -moz-padding-end: 60px; 842 -moz-padding-end: 60px;
805 -webkit-padding-end: 60px; 843 -webkit-padding-end: 60px;
806 padding-top: 18px; 844 padding-top: 18px;
807 padding-bottom: 18px; 845 padding-bottom: 18px;
Wladimir Palant 2016/02/23 15:26:04 This makes no sense, it's impossible to have heigh
saroyanm 2016/02/24 11:23:59 Yes you are right, but the issue is not about the
808 width: 100%; 846 width: 100%;
809 } 847 }
810 848
811 #custom-filters input[type="text"]:focus 849 #custom-filters input[type="text"]:focus
812 { 850 {
813 outline: 0px; 851 outline: 0px;
814 } 852 }
815 853
816 #custom-filters-add input 854 #custom-filters-add input
817 { 855 {
(...skipping 12 matching lines...) Expand all
830 868
831 #custom-filters-table 869 #custom-filters-table
832 { 870 {
833 border-top: 1px solid #CDCDCD; 871 border-top: 1px solid #CDCDCD;
834 } 872 }
835 873
836 #custom-filters-add button 874 #custom-filters-add button
837 { 875 {
838 font-size: 14px; 876 font-size: 14px;
839 -webkit-margin-start: -60px; 877 -webkit-margin-start: -60px;
840 -moz-margin-start: -60px; 878 -moz-margin-start: -60px;
Wladimir Palant 2016/02/23 15:16:08 This apparently assumes a particular text size. Op
saroyanm 2016/02/24 11:23:58 Thanks for noticing this, totally forgot about thi
841 -webkit-padding-end: 6px; 879 -webkit-padding-end: 6px;
842 -moz-padding-end: 6px; 880 -moz-padding-end: 6px;
843 cursor: pointer; 881 cursor: pointer;
844 color: #3A7BA6; 882 color: #3A7BA6;
845 } 883 }
846 884
847 #custom-filters-add button::before 885 #custom-filters-add button::before
848 { 886 {
849 content: ""; 887 content: "";
850 display: inline-block; 888 display: inline-block;
(...skipping 16 matching lines...) Expand all
867 -moz-margin-start: 6px; 905 -moz-margin-start: 6px;
868 width: 10px; 906 width: 10px;
869 } 907 }
870 908
871 /* 909 /*
872 Tooltips 910 Tooltips
873 */ 911 */
874 912
875 .tooltip, #block-element-explanation a 913 .tooltip, #block-element-explanation a
876 { 914 {
915 position: relative;
916 margin: 0px 4px;
877 border-bottom: dashed 1px; 917 border-bottom: dashed 1px;
918 height: 15px;
878 color: #3A7BA6; 919 color: #3A7BA6;
920 font-size: 12px;
921 line-height: 19px;
922 text-decoration: none;
923 font-weight: 400;
879 cursor: default; 924 cursor: default;
880 font-size: 12px;
881 height: 15px;
882 line-height: 19px;
883 margin: 0px 4px;
884 position: relative;
885 text-decoration: none;
886 } 925 }
887 926
888 .context-menu 927 .context-menu
889 { 928 {
890 display: inline-block; 929 display: inline-block;
891 position: relative; 930 position: relative;
892 border-bottom: none; 931 border-bottom: none;
893 } 932 }
894 933
895 .context-menu a 934 .context-menu a
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 #other-language .button-add::before 1351 #other-language .button-add::before
1313 { 1352 {
1314 display: none; 1353 display: none;
1315 } 1354 }
1316 1355
1317 #other-language .display 1356 #other-language .display
1318 { 1357 {
1319 -webkit-margin-start: 10px; 1358 -webkit-margin-start: 10px;
1320 -moz-margin-start: 10px; 1359 -moz-margin-start: 10px;
1321 } 1360 }
OLDNEW
« options.html ('K') | « options.html ('k') | skin/options-sprite.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld