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

Side by Side Diff: skin/options.css

Issue 29333819: Issue 2375 - Implement "Blocking lists" section in new options page (Closed)
Patch Set: Created Jan. 18, 2016, 9:50 a.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-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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 border-color: #CDCDCD transparent; 176 border-color: #CDCDCD transparent;
177 border-style: solid; 177 border-style: solid;
178 border-width: 1px; 178 border-width: 1px;
179 font-size: 16px; 179 font-size: 16px;
180 font-weight: 300; 180 font-weight: 300;
181 line-height: 1em; 181 line-height: 1em;
182 margin-top: -1px; 182 margin-top: -1px;
183 padding: 14px 20px; 183 padding: 14px 20px;
184 } 184 }
185 185
186 body[data-tab="general"] #tab-general, 186 body[data-tab*="general"] #tab-general,
187 body[data-tab="advanced"] #tab-advanced, 187 body[data-tab*="advanced"] #tab-advanced,
Thomas Greiner 2016/01/19 11:27:31 We don't expect this to be positioned anywhere ins
saroyanm 2016/01/22 09:55:10 It depends on other comment regarding showing the
188 body[data-tab="help"] #tab-help 188 body[data-tab*="help"] #tab-help
189 { 189 {
190 background-color: #FFFFFF; 190 background-color: #FFFFFF;
191 border-radius: 3px 0px 0px 3px; 191 border-radius: 3px 0px 0px 3px;
192 border-width: 1px; 192 border-width: 1px;
193 font-weight: 600; 193 font-weight: 600;
194 -moz-border-start-color: #CDCDCD; 194 -moz-border-start-color: #CDCDCD;
195 -webkit-border-start-color: #CDCDCD; 195 -webkit-border-start-color: #CDCDCD;
196 -moz-margin-end: -1px; 196 -moz-margin-end: -1px;
197 -webkit-margin-end: -1px; 197 -webkit-margin-end: -1px;
198 -moz-margin-start: -1px; 198 -moz-margin-start: -1px;
199 -webkit-margin-start: -1px; 199 -webkit-margin-start: -1px;
200 -moz-padding-end: 21px; 200 -moz-padding-end: 21px;
201 -webkit-padding-end: 21px; 201 -webkit-padding-end: 21px;
202 -moz-padding-start: 21px; 202 -moz-padding-start: 21px;
203 -webkit-padding-start: 21px; 203 -webkit-padding-start: 21px;
204 } 204 }
205 205
206 html[dir="rtl"] body[data-tab="general"] #tab-general, 206 html[dir="rtl"] body[data-tab*="general"] #tab-general,
207 html[dir="rtl"] body[data-tab="advanced"] #tab-advanced, 207 html[dir="rtl"] body[data-tab*="advanced"] #tab-advanced,
208 html[dir="rtl"] body[data-tab="help"] #tab-help 208 html[dir="rtl"] body[data-tab*="help"] #tab-help
209 { 209 {
210 border-radius: 0px 3px 3px 0px; 210 border-radius: 0px 3px 3px 0px;
211 } 211 }
212 212
213 .tabs.vertical.bottom 213 .tabs.vertical.bottom
214 { 214 {
215 bottom: 0px; 215 bottom: 0px;
216 position: absolute; 216 position: absolute;
217 } 217 }
218 218
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 #content-wrapper 303 #content-wrapper
304 { 304 {
305 position: relative; 305 position: relative;
306 } 306 }
307 307
308 #content-wrapper > div 308 #content-wrapper > div
309 { 309 {
310 display: none; 310 display: none;
311 } 311 }
312 312
313 body[data-tab="general"] #content-general, 313 body[data-tab*="general"] #content-general,
314 body[data-tab="advanced"] #content-advanced, 314 body[data-tab*="advanced"] #content-advanced,
315 body[data-tab="help"] #content-help 315 body[data-tab*="help"] #content-help
316 { 316 {
317 display: block; 317 display: block;
318 } 318 }
319 319
320 div.button 320 div.button
321 { 321 {
322 cursor: pointer; 322 cursor: pointer;
323 display: flex; 323 display: flex;
324 } 324 }
325 325
(...skipping 23 matching lines...) Expand all
349 .table li.empty-placeholder 349 .table li.empty-placeholder
350 { 350 {
351 background-color: #F5F5F5; 351 background-color: #F5F5F5;
352 } 352 }
353 353
354 .table label 354 .table label
355 { 355 {
356 vertical-align: top; 356 vertical-align: top;
357 } 357 }
358 358
359 .table.cols span
360 {
361 display: inline-block;
362 width: 30%;
363 }
364
365 .table.cols .col-name 359 .table.cols .col-name
366 { 360 {
367 border-bottom: 1px solid #CDCDCD; 361 border-bottom: 1px solid #CDCDCD;
368 } 362 }
369 363
370 .table.cols .col-name span 364 .table.cols .col-name span
371 { 365 {
372 display: inline-block; 366 display: inline-block;
373 width: 30%; 367 width: 30%;
374 } 368 }
375 369
376 .table.cols .col-name span:first-child 370 .table.cols li:first-child
377 { 371 {
378 -webkit-padding-start: 38px; 372 border-bottom: 1px solid #CDCDCD;
379 -moz-padding-start: 38px; 373 }
374
375 .table.cols li:last-child
376 {
377 border-bottom: 1px solid #CDCDCD;
380 } 378 }
Thomas Greiner 2016/01/19 11:27:30 You can merge those two rules above.
saroyanm 2016/01/22 09:55:11 Done.
381 379
382 .table::-webkit-scrollbar, 380 .table::-webkit-scrollbar,
383 #custom-wrapper::-webkit-scrollbar 381 #custom-wrapper::-webkit-scrollbar
384 { 382 {
385 -webkit-padding-end: 10px; 383 -webkit-padding-end: 10px;
386 width: 5px; 384 width: 5px;
387 } 385 }
388 386
389 .table::-webkit-scrollbar-thumb, 387 .table::-webkit-scrollbar-thumb,
390 #custom-wrapper::-webkit-scrollbar-thumb 388 #custom-wrapper::-webkit-scrollbar-thumb
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 .table .popular 443 .table .popular
446 { 444 {
447 color: #1E8728; 445 color: #1E8728;
448 font-size: 12px; 446 font-size: 12px;
449 -moz-padding-end: 12px; 447 -moz-padding-end: 12px;
450 -webkit-padding-end: 12px; 448 -webkit-padding-end: 12px;
451 } 449 }
452 450
453 .tabs.horizontal 451 .tabs.horizontal
454 { 452 {
453 display: flex;
455 margin-bottom: 0px; 454 margin-bottom: 0px;
456 padding: 0px; 455 padding: 0px;
457 } 456 }
458 457
459 .tabs.horizontal li 458 .tabs.horizontal li
460 { 459 {
460 display: inline-block;
461 border-bottom: 1px solid #A1A1A1; 461 border-bottom: 1px solid #A1A1A1;
462 display: inline-block;
463 color: #3A7BA6; 462 color: #3A7BA6;
464 padding: 10px 0px 11px 0px; 463 padding: 10px 46px;
465 text-align: center; 464 text-align: center;
466 width: 50%;
467 } 465 }
468 466
469 .tabs.horizontal li.active 467 .icon,
470 { 468 .table input[type="checkbox"]::before,
471 border-bottom: 2px solid #1E8728; 469 .table button.delete,
472 color: black; 470 #content-help a::before,
473 font-weight: 600; 471 #dialog-close::before,
474 padding-bottom: 10px;
475 }
476
477 .icon, .table input[type="checkbox"]::before, .table button.delete,
478 #content-help a::before, #dialog-close::before,
479 #custom-filters-add button::after, 472 #custom-filters-add button::after,
480 #dialog-body button::before 473 #dialog-body button::before,
474 .date::before,
475 .time::before,
476 #filter-lists .arrow,
477 .context-menu .content a::before
481 { 478 {
482 background-image: url(options-sprite.png); 479 background-image: url(options-sprite.png);
483 display: inline-block; 480 display: inline-block;
484 } 481 }
485 482
486 .icon-add 483 .icon-add
487 { 484 {
488 background-position: -0px -0px; 485 background-position: -0px -0px;
489 cursor: pointer; 486 cursor: pointer;
490 height: 18px; 487 height: 18px;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 -webkit-margin-start: 32px; 611 -webkit-margin-start: 32px;
615 } 612 }
616 613
617 #whitelisting-add-button + span 614 #whitelisting-add-button + span
618 { 615 {
619 flex: 1; 616 flex: 1;
620 } 617 }
621 618
622 .icon-enter 619 .icon-enter
623 { 620 {
624 background-position: -18px -85px; 621 background-position: -18px -32px;
625 cursor: pointer; 622 cursor: pointer;
626 height: 10px; 623 height: 10px;
627 position: absolute; 624 position: absolute;
628 top: 10px; 625 top: 10px;
629 -moz-margin-start: -20px; 626 -moz-margin-start: -20px;
630 -webkit-margin-start: -20px; 627 -webkit-margin-start: -20px;
631 width: 10px; 628 width: 10px;
632 } 629 }
633 630
634 .button-add, .cancel-button 631 .button-add, .cancel-button
635 { 632 {
636 background-color: transparent; 633 background-color: transparent;
637 border: 0px; 634 border: 0px;
638 color: #3A7BA6; 635 color: #3A7BA6;
639 cursor: pointer; 636 cursor: pointer;
640 } 637 }
641 638
642 /* 639 /*
643 Advanced tab content 640 Advanced tab content
644 */ 641 */
645 642
643 #blocking-lists > div
644 {
645 display: none;
646 }
647
648 body[data-tab*="filter-lists"] #filter-lists,
649 body[data-tab*="custom-filters"] #custom-filters
650 {
651 display: block;
652 }
653
654 body[data-tab*="filter-lists"] #content-advanced [data-tab="advanced,filter-list s"],
655 body[data-tab*="custom-filters"] #content-advanced [data-tab="advanced,custom-fi lters"]
656 {
657 border-bottom: 2px solid #1E8728;
658 color: black;
659 font-weight: 600;
660 padding-bottom: 10px;
661 }
662
663 #filter-lists .table
664 {
665 display: inline-block;
666 }
667
668 #filter-lists .table li
Thomas Greiner 2016/01/19 11:27:30 I noticed that long filter list titles cause the l
Thomas Greiner 2016/01/19 11:27:30 According to the style guide the padding above and
saroyanm 2016/01/22 09:55:12 Done.
saroyanm 2016/01/22 09:55:12 Currently it's consistent with other list elements
Thomas Greiner 2016/01/25 15:40:28 Note that the behavior changes with https://codere
saroyanm 2016/01/26 18:36:16 Acknowledged.
669 {
670 padding-left: 16px;
671 padding-right: 16px;
672 }
673
674 #filter-lists .table li > span:first-of-type
675 {
676 display: inline-block;
677 width: 330px;
678 }
679
680 #filter-lists .table li span.display
681 {
682 cursor: pointer;
683 }
684
685 #filter-lists .table .head span:first-child
686 {
687 -webkit-padding-start: 38px;
688 -moz-padding-start: 38px;
689 }
690
691 #filter-lists .controls
Thomas Greiner 2016/01/19 11:27:31 Detail: The margins for the buttons are not accord
saroyanm 2016/01/22 09:55:11 Done.
692 {
693 border-top: none;
694 }
695
696 #filter-lists .arrow
Thomas Greiner 2016/01/19 11:27:30 I understand that we might not want to reorder the
saroyanm 2016/01/22 09:55:12 Done.
697 {
698 border-style: none;
699 padding: 0px;
700 background-color: transparent;
701 background-position: -1px -54px;
702 -webkit-margin-start: 6px;
703 -moz-margin-start: 6px;
704 width: 6px;
705 height: 4px;
706 margin: 0px;
Thomas Greiner 2016/01/19 11:27:31 You're overriding the margin you've set above so i
saroyanm 2016/01/22 09:55:12 Done.
707 }
708
709 #filter-lists .table li:last-of-type a
Thomas Greiner 2016/01/19 11:27:30 Detail: According to the style guide this element
saroyanm 2016/01/22 09:55:11 Done.
710 {
711 color: #3A7BA6;
712 text-decoration: none;
713 }
714
715 .date::before
716 {
717 content: "";
718 -webkit-margin-end: 6px;
719 -moz-margin-end: 6px;
720 background-position: -7px -49px;
721 height: 12px;
722 width: 12px;
723
724 }
725
726 .time::before
727 {
728 content: "";
729 -webkit-margin-end: 6px;
730 -moz-margin-end: 6px;
731 -webkit-margin-start: 12px;
732 -moz-margin-start: 12px;
733 background-position: -20px -49px;
734 height: 12px;
735 width: 12px;
736 }
737
646 #custom-filters-header 738 #custom-filters-header
647 { 739 {
648 padding: 0px 20px; 740 padding: 0px 20px;
649 margin-bottom: 10px; 741 margin-bottom: 10px;
650 } 742 }
651 743
652 #custom-filters-raw-controls 744 #custom-filters-raw-controls
653 { 745 {
654 display: flex; 746 display: flex;
655 } 747 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 height: 15px; 850 height: 15px;
759 -webkit-margin-end: 10px; 851 -webkit-margin-end: 10px;
760 -moz-margin-end: 10px; 852 -moz-margin-end: 10px;
761 margin-bottom: -2px; 853 margin-bottom: -2px;
762 width: 1px; 854 width: 1px;
763 } 855 }
764 856
765 #custom-filters-add button::after 857 #custom-filters-add button::after
766 { 858 {
767 content: ""; 859 content: "";
768 background-position: -28px -85px; 860 background-position: -28px -32px;
769 cursor: pointer; 861 cursor: pointer;
770 height: 10px; 862 height: 10px;
771 -webkit-margin-start: 6px; 863 -webkit-margin-start: 6px;
772 -moz-margin-start: 6px; 864 -moz-margin-start: 6px;
773 width: 10px; 865 width: 10px;
774 } 866 }
775 867
776 /* 868 /*
777 Tooltips 869 Tooltips
778 */ 870 */
779 871
780 .tooltip, #block-element-explanation a 872 .tooltip, #block-element-explanation a
781 { 873 {
782 border-bottom: dashed 1px; 874 border-bottom: dashed 1px;
783 color: #3A7BA6; 875 color: #3A7BA6;
784 cursor: default; 876 cursor: default;
785 font-size: 12px; 877 font-size: 12px;
786 height: 15px; 878 height: 15px;
787 line-height: 19px; 879 line-height: 19px;
788 margin: 0px 4px; 880 margin: 0px 4px;
789 position: relative; 881 position: relative;
790 text-decoration: none; 882 text-decoration: none;
791 } 883 }
792 884
885 .context-menu
886 {
887 display: inline-block;
888 border-bottom:none;
Thomas Greiner 2016/01/19 11:27:31 Detail: Missing whitespace after colon.
saroyanm 2016/01/22 09:55:12 Done.
889 position: relative;
890 }
891
892 .context-menu a
893 {
894 white-space: nowrap;
895 color: #FFF;
896 vertical-align: middle;
897 }
898
793 #content-advanced .tooltip 899 #content-advanced .tooltip
794 { 900 {
795 -moz-margin-start: 8px; 901 -moz-margin-start: 8px;
796 -webkit-margin-start: 8px; 902 -webkit-margin-start: 8px;
797 } 903 }
798 904
799 #block-element-explanation a 905 #block-element-explanation a
800 { 906 {
801 color: black; 907 color: black;
802 border-bottom-color: #3A7BA6; 908 border-bottom-color: #3A7BA6;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 942
837 .tooltip:not(:hover) > div[role="tooltip"], 943 .tooltip:not(:hover) > div[role="tooltip"],
838 div[role="tooltip"]:hover 944 div[role="tooltip"]:hover
839 { 945 {
840 visibility: hidden; 946 visibility: hidden;
841 opacity: 0; 947 opacity: 0;
842 -webkit-transition-delay: 0ms; 948 -webkit-transition-delay: 0ms;
843 transition-delay: 0ms; 949 transition-delay: 0ms;
844 } 950 }
845 951
846 div[role="tooltip"]::before 952 div[role="tooltip"]::before,
953 div[role="context-menu"]::before
847 { 954 {
848 background-image: url(options-sprite.png); 955 background-image: url(options-sprite.png);
849 background-position: -8px -42px; 956 background-position: -8px -42px;
850 content: ""; 957 content: "";
851 height: 6px; 958 height: 6px;
852 position: absolute; 959 position: absolute;
853 top: -6px; 960 top: -6px;
854 width: 14px; 961 width: 14px;
855 left: 30px; 962 left: 30px;
856 } 963 }
857 964
965 div[role="context-menu"]
966 {
967 position: absolute;
968 top: 21px;
969 z-index: 1;
970 visibility: hidden;
971 }
972
973 li.context div[role="context-menu"]
974 {
975 visibility: visible;
976 }
977
978 div[role="context-menu"]::before
979 {
980 left: -4px;
981 }
982
983 html[dir="rtl"] div[role="context-menu"]::before
984 {
985 left: inherit;
986 right: -4px;
987 }
988
989 div[role="context-menu"] > div
990 {
991 position: relative;
992 left: calc(-100%/2);
Thomas Greiner 2016/01/19 11:27:30 That's the same as writing `left: -50%`. Anyway, d
saroyanm 2016/01/22 09:55:12 Done.
993 background-color: rgba(45, 45, 45, 0.95);
994 padding: 10px;
Thomas Greiner 2016/01/19 11:27:30 According to the style guide each menu item should
saroyanm 2016/01/22 09:55:12 Done.
995 border-radius: 3px;
996 }
997
998 html[dir="rtl"] div[role="context-menu"] > div
999 {
1000 left: inherit;
1001 right: calc(-100%/2);
1002 }
1003
1004 div[role="context-menu"] > div a::before
1005 {
1006 content: "";
1007 -moz-margin-end: 8px;
1008 -webkit-margin-end: 8px;
1009 }
1010
1011 div[role="context-menu"] > div a
1012 {
1013 display: block;
1014 text-decoration: none;
1015 padding: 6px 0px;
1016 border-bottom: 1px solid #CDCDCD;
1017 }
1018
1019 div[role="context-menu"] > div a:last-child
1020 {
1021 border: none;
1022 }
1023
1024 div[role="context-menu"] [data-action="update-now"]::before
1025 {
1026 background-position: -38px -33px;
1027 height: 10px;
1028 width: 14px;
Thomas Greiner 2016/01/19 11:27:31 Why does each of those icons have its own width an
saroyanm 2016/01/22 09:55:11 Done.
1029 }
1030
1031 div[role="context-menu"] [data-action="website"]::before
1032 {
1033 background-position: -33px -47px;
1034 height: 14px;
1035 width: 16px;
1036 }
1037
1038 div[role="context-menu"] [data-action="source"]::before
1039 {
1040 background-position: -53px -32px;
1041 height: 18px;
1042 width: 14px;
1043 }
1044
1045 div[role="context-menu"] [data-action="delete"]::before
1046 {
1047 background-position: -71px -32px;
1048 height: 16px;
1049 width: 12px;
1050 }
1051
858 html[dir="ltr"] div[role="tooltip"].flip-vertical::before, 1052 html[dir="ltr"] div[role="tooltip"].flip-vertical::before,
859 html[dir="rtl"] div[role="tooltip"]:not(.flip-vertical)::before 1053 html[dir="rtl"] div[role="tooltip"]:not(.flip-vertical)::before
860 { 1054 {
861 left: inherit; 1055 left: inherit;
862 right: 30px; 1056 right: 30px;
863 } 1057 }
864 1058
865 div[role="tooltip"] img 1059 div[role="tooltip"] img
866 { 1060 {
867 float: left; 1061 float: left;
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 #other-language .button-add::before 1296 #other-language .button-add::before
1103 { 1297 {
1104 display: none; 1298 display: none;
1105 } 1299 }
1106 1300
1107 #other-language .display 1301 #other-language .display
1108 { 1302 {
1109 -webkit-margin-start: 10px; 1303 -webkit-margin-start: 10px;
1110 -moz-margin-start: 10px; 1304 -moz-margin-start: 10px;
1111 } 1305 }
OLDNEW
« options.js ('K') | « options.js ('k') | skin/options-sprite.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld