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: Addressed Thomas comments Created Jan. 22, 2016, 9:53 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,
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 11 matching lines...) Expand all
337 padding: 14px 0px; 337 padding: 14px 0px;
338 -webkit-padding-start: 16px; 338 -webkit-padding-start: 16px;
339 -moz-padding-start: 16px; 339 -moz-padding-start: 16px;
340 } 340 }
341 341
342 .table.list li .display 342 .table.list li .display
343 { 343 {
344 flex: 1; 344 flex: 1;
345 } 345 }
346 346
347 .table.list li:nth-child(odd), 347 .table.list li:nth-child(odd),
Thomas Greiner 2016/01/25 15:40:38 I guess you'd also want to do change it here.
saroyanm 2016/01/26 18:36:20 Done.
348 .table.cols li:nth-child(even), 348 .table.cols li:nth-of-type(odd),
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 359 .table.cols
360 {
361 display: inline-block;
362 width: 30%;
363 }
364
365 .table.cols .col-name
366 { 360 {
367 border-bottom: 1px solid #CDCDCD; 361 border-bottom: 1px solid #CDCDCD;
368 } 362 border-top: 1px solid #CDCDCD;
369
370 .table.cols .col-name span
371 {
372 display: inline-block;
373 width: 30%;
374 }
375
376 .table.cols .col-name span:first-child
377 {
378 -webkit-padding-start: 38px;
379 -moz-padding-start: 38px;
380 } 363 }
381 364
382 .table::-webkit-scrollbar, 365 .table::-webkit-scrollbar,
383 #custom-wrapper::-webkit-scrollbar 366 #custom-wrapper::-webkit-scrollbar
384 { 367 {
385 -webkit-padding-end: 10px; 368 -webkit-padding-end: 10px;
386 width: 5px; 369 width: 5px;
387 } 370 }
388 371
389 .table::-webkit-scrollbar-thumb, 372 .table::-webkit-scrollbar-thumb,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 .table input[type="checkbox"]:checked::before 404 .table input[type="checkbox"]:checked::before
422 { 405 {
423 content: ""; 406 content: "";
424 background-position: -68px 0px; 407 background-position: -68px 0px;
425 height: 18px; 408 height: 18px;
426 padding: 0px; 409 padding: 0px;
427 width: 18px; 410 width: 18px;
428 visibility: visible; 411 visibility: visible;
429 } 412 }
430 413
414 input[disabled="true"]::before
415 {
416 background-color: #ccc;
417 border-radius: 2px;
418 }
419
431 .table button.delete 420 .table button.delete
432 { 421 {
433 background-color: transparent; 422 background-color: transparent;
434 background-position: -9px -32px; 423 background-position: -9px -32px;
435 border: 0px; 424 border: 0px;
436 height: 10px; 425 height: 10px;
437 margin-top: 5px; 426 margin-top: 5px;
438 -moz-margin-end: 20px; 427 -moz-margin-end: 20px;
439 -webkit-margin-end: 20px; 428 -webkit-margin-end: 20px;
440 padding: 0px; 429 padding: 0px;
441 cursor: pointer; 430 cursor: pointer;
442 width: 10px; 431 width: 10px;
443 } 432 }
444 433
445 .table .popular 434 .table .popular
446 { 435 {
447 color: #1E8728; 436 color: #1E8728;
448 font-size: 12px; 437 font-size: 12px;
449 -moz-padding-end: 12px; 438 -moz-padding-end: 12px;
450 -webkit-padding-end: 12px; 439 -webkit-padding-end: 12px;
451 } 440 }
452 441
453 .tabs.horizontal 442 .tabs.horizontal
454 { 443 {
444 display: flex;
455 margin-bottom: 0px; 445 margin-bottom: 0px;
456 padding: 0px; 446 padding: 0px;
457 } 447 }
458 448
459 .tabs.horizontal li 449 .tabs.horizontal li
460 { 450 {
451 display: inline-block;
461 border-bottom: 1px solid #A1A1A1; 452 border-bottom: 1px solid #A1A1A1;
462 display: inline-block;
463 color: #3A7BA6; 453 color: #3A7BA6;
464 padding: 10px 0px 11px 0px; 454 padding: 10px 46px;
465 text-align: center; 455 text-align: center;
466 width: 50%;
467 } 456 }
468 457
469 .tabs.horizontal li.active 458 .icon,
470 { 459 .table input[type="checkbox"]::before,
471 border-bottom: 2px solid #1E8728; 460 .table button.delete,
472 color: black; 461 #content-help a::before,
473 font-weight: 600; 462 #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, 463 #custom-filters-add button::after,
480 #dialog-body button::before 464 #dialog-body button::before,
465 .date::before,
466 .time::before,
467 #filter-lists .arrow,
468 .context-menu .content a::before
481 { 469 {
482 background-image: url(options-sprite.png); 470 background-image: url(options-sprite.png);
483 display: inline-block; 471 display: inline-block;
484 } 472 }
485 473
486 .icon-add 474 .icon-add
487 { 475 {
488 background-position: -0px -0px; 476 background-position: -0px -0px;
489 cursor: pointer; 477 cursor: pointer;
490 height: 18px; 478 height: 18px;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 -webkit-margin-start: 32px; 602 -webkit-margin-start: 32px;
615 } 603 }
616 604
617 #whitelisting-add-button + span 605 #whitelisting-add-button + span
618 { 606 {
619 flex: 1; 607 flex: 1;
620 } 608 }
621 609
622 .icon-enter 610 .icon-enter
623 { 611 {
624 background-position: -18px -85px; 612 background-position: -18px -32px;
625 cursor: pointer; 613 cursor: pointer;
626 height: 10px; 614 height: 10px;
627 position: absolute; 615 position: absolute;
628 top: 10px; 616 top: 10px;
629 -moz-margin-start: -20px; 617 -moz-margin-start: -20px;
630 -webkit-margin-start: -20px; 618 -webkit-margin-start: -20px;
631 width: 10px; 619 width: 10px;
632 } 620 }
633 621
634 .button-add, .cancel-button 622 .button-add, .cancel-button
635 { 623 {
636 background-color: transparent; 624 background-color: transparent;
637 border: 0px; 625 border: 0px;
638 color: #3A7BA6; 626 color: #3A7BA6;
639 cursor: pointer; 627 cursor: pointer;
640 } 628 }
641 629
642 /* 630 /*
643 Advanced tab content 631 Advanced tab content
644 */ 632 */
645 633
634 #blocking-lists > div
635 {
636 display: none;
637 }
638
639 body[data-tab*="filter-lists"] #filter-lists,
640 body[data-tab*="custom-filters"] #custom-filters
641 {
642 display: block;
643 }
644
645 body[data-tab*="filter-lists"] #content-advanced [data-tab="advanced,filter-list s"],
646 body[data-tab*="custom-filters"] #content-advanced [data-tab="advanced,custom-fi lters"]
647 {
648 border-bottom: 2px solid #1E8728;
649 padding-bottom: 10px;
650 color: black;
651 font-weight: 600;
652 }
653
654 #filter-lists .table
655 {
656 display: inline-block;
657 }
658
659 #filter-lists .table li
660 {
661 padding-left: 16px;
662 padding-right: 16px;
663 }
664
665 #filter-lists .table li > span:first-of-type
666 {
667 display: inline-block;
668 width: 330px;
669 }
670
671 .table-header
672 {
673 display: flex;
674 }
675
676 .table-header h3
677 {
678 display: inline-block;
679 margin-bottom: 7px;
680 font-size: 14px;
681 }
682
683 .table-header h3:first-child
684 {
685 width: 330px;
686 -webkit-padding-start: 54px;
687 -moz-padding-start: 54px;
688 }
689
690 #filter-lists .table li span.display
691 {
692 cursor: pointer;
693 }
694
695 #filter-lists .table .head span:first-child
696 {
697 -webkit-padding-start: 38px;
698 -moz-padding-start: 38px;
699 }
700
701 #filter-lists .controls
702 {
703 padding-top: 0px;
704 border-top: none;
705 }
706
707 #filter-lists .controls button
708 {
709 margin-top: 14px;
710 }
711
712 #filter-lists .arrow
713 {
714 border-style: none;
715 padding: 0px;
716 width: 6px;
717 height: 4px;
718 margin: 0px;
719 background-color: transparent;
720 background-position: -1px -54px;
721 }
722
723 #filter-lists .table li:last-of-type a
724 {
725 color: #3A7BA6;
726 text-decoration: none;
727 }
728
729 #filter-lists .table li:last-of-type span:last-child
730 {
731 -webkit-margin-start: auto;
732 -moz-margin-start: auto;
733 }
734
735 .date::before
736 {
737 content: "";
738 -webkit-margin-end: 6px;
739 -moz-margin-end: 6px;
740 height: 12px;
741 width: 12px;
742 background-position: -7px -49px;
743 }
744
745 .time::before
746 {
747 content: "";
748 -webkit-margin-end: 6px;
749 -moz-margin-end: 6px;
750 -webkit-margin-start: 12px;
751 -moz-margin-start: 12px;
752 height: 12px;
753 width: 12px;
754 background-position: -20px -49px;
755 }
756
646 #custom-filters-header 757 #custom-filters-header
647 { 758 {
648 padding: 0px 20px; 759 padding: 0px 20px;
649 margin-bottom: 10px; 760 margin-bottom: 10px;
650 } 761 }
651 762
652 #custom-filters-raw-controls 763 #custom-filters-raw-controls
653 { 764 {
654 display: flex; 765 display: flex;
655 } 766 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 height: 15px; 869 height: 15px;
759 -webkit-margin-end: 10px; 870 -webkit-margin-end: 10px;
760 -moz-margin-end: 10px; 871 -moz-margin-end: 10px;
761 margin-bottom: -2px; 872 margin-bottom: -2px;
762 width: 1px; 873 width: 1px;
763 } 874 }
764 875
765 #custom-filters-add button::after 876 #custom-filters-add button::after
766 { 877 {
767 content: ""; 878 content: "";
768 background-position: -28px -85px; 879 background-position: -28px -32px;
769 cursor: pointer; 880 cursor: pointer;
770 height: 10px; 881 height: 10px;
771 -webkit-margin-start: 6px; 882 -webkit-margin-start: 6px;
772 -moz-margin-start: 6px; 883 -moz-margin-start: 6px;
773 width: 10px; 884 width: 10px;
774 } 885 }
775 886
776 /* 887 /*
777 Tooltips 888 Tooltips
778 */ 889 */
779 890
780 .tooltip, #block-element-explanation a 891 .tooltip, #block-element-explanation a
781 { 892 {
782 border-bottom: dashed 1px; 893 border-bottom: dashed 1px;
783 color: #3A7BA6; 894 color: #3A7BA6;
784 cursor: default; 895 cursor: default;
785 font-size: 12px; 896 font-size: 12px;
786 height: 15px; 897 height: 15px;
787 line-height: 19px; 898 line-height: 19px;
788 margin: 0px 4px; 899 margin: 0px 4px;
789 position: relative; 900 position: relative;
790 text-decoration: none; 901 text-decoration: none;
791 } 902 }
792 903
904 .context-menu
Thomas Greiner 2016/01/27 17:16:58 According to the style guide there should be 6px b
saroyanm 2016/01/28 17:00:12 Sorry, from some point I missed the style-guide an
Thomas Greiner 2016/01/29 17:48:08 There's still no 6px between the title and the arr
saroyanm 2016/01/29 18:56:17 my fault, were thinking about the 6px vertically b
905 {
906 display: inline-block;
907 position: relative;
908 border-bottom: none;
909 }
910
911 .context-menu a
912 {
913 vertical-align: middle;
914 white-space: nowrap;
915 color: #FFF;
916 }
917
793 #content-advanced .tooltip 918 #content-advanced .tooltip
794 { 919 {
795 -moz-margin-start: 8px; 920 -moz-margin-start: 8px;
796 -webkit-margin-start: 8px; 921 -webkit-margin-start: 8px;
797 } 922 }
798 923
799 #block-element-explanation a 924 #block-element-explanation a
800 { 925 {
801 color: black; 926 color: black;
802 border-bottom-color: #3A7BA6; 927 border-bottom-color: #3A7BA6;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 961
837 .tooltip:not(:hover) > div[role="tooltip"], 962 .tooltip:not(:hover) > div[role="tooltip"],
838 div[role="tooltip"]:hover 963 div[role="tooltip"]:hover
839 { 964 {
840 visibility: hidden; 965 visibility: hidden;
841 opacity: 0; 966 opacity: 0;
842 -webkit-transition-delay: 0ms; 967 -webkit-transition-delay: 0ms;
843 transition-delay: 0ms; 968 transition-delay: 0ms;
844 } 969 }
845 970
846 div[role="tooltip"]::before 971 div[role="tooltip"]::before,
972 div.container::before
Thomas Greiner 2016/01/25 15:40:38 Was it intentional to call the class "container" e
saroyanm 2016/01/26 18:36:20 Not sure why I named it so, but I agree with you t
847 { 973 {
848 background-image: url(options-sprite.png); 974 background-image: url(options-sprite.png);
849 background-position: -8px -42px; 975 background-position: -8px -42px;
850 content: ""; 976 content: "";
851 height: 6px; 977 height: 6px;
852 position: absolute; 978 position: absolute;
853 top: -6px; 979 top: -6px;
854 width: 14px; 980 width: 14px;
855 left: 30px; 981 left: 30px;
856 } 982 }
857 983
984 div.container
985 {
986 position: absolute;
987 top: 21px;
988 z-index: 1;
989 visibility: hidden;
990 }
991
992 li.context div.container
993 {
994 visibility: visible;
995 }
996
997 div.container::before
998 {
999 left: -4px;
1000 }
1001
1002 html[dir="rtl"] div.container::before
1003 {
1004 left: inherit;
1005 right: -4px;
1006 }
1007
1008 .context-menu div.container > div
1009 {
1010 position: relative;
1011 left: calc(-50% + 2px);
1012 background-color: rgba(45, 45, 45, 0.95);
1013 padding: 0px 10px;
1014 border-radius: 3px;
1015 }
1016
1017 html[dir="rtl"] div.container > div
1018 {
1019 left: inherit;
1020 right: -50%;
1021 }
1022
1023 div.container > div a::before
1024 {
1025 content: "";
1026 -moz-margin-end: 8px;
1027 -webkit-margin-end: 8px;
1028 }
1029
1030 div.container > div a
1031 {
1032 display: block;
1033 text-decoration: none;
1034 padding: 6px 0px;
1035 border-bottom: 1px solid #CDCDCD;
1036 cursor: pointer;
1037 vertical-align: middle;
1038 }
1039
1040 div.container > div a:before
1041 {
1042 vertical-align: middle;
1043 height: 16px;
1044 width: 16px;
1045 }
1046
1047 div.container > div a:last-child
1048 {
1049 border: none;
1050 }
1051
1052 div.container [data-action="update-now"]::before
1053 {
1054 background-position: -38px -31px;
1055 }
1056
1057 div.container [data-action="website"]::before
1058 {
1059 background-position: -33px -47px;
1060 }
1061
1062 div.container [data-action="source"]::before
1063 {
1064 background-position: -53px -34px;
1065 }
1066
1067 div.container [data-action="delete"]::before
1068 {
1069 background-position: -71px -34px;
1070 }
1071
858 html[dir="ltr"] div[role="tooltip"].flip-vertical::before, 1072 html[dir="ltr"] div[role="tooltip"].flip-vertical::before,
859 html[dir="rtl"] div[role="tooltip"]:not(.flip-vertical)::before 1073 html[dir="rtl"] div[role="tooltip"]:not(.flip-vertical)::before
860 { 1074 {
861 left: inherit; 1075 left: inherit;
862 right: 30px; 1076 right: 30px;
863 } 1077 }
864 1078
865 div[role="tooltip"] img 1079 div[role="tooltip"] img
866 { 1080 {
867 float: left; 1081 float: left;
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 #other-language .button-add::before 1316 #other-language .button-add::before
1103 { 1317 {
1104 display: none; 1318 display: none;
1105 } 1319 }
1106 1320
1107 #other-language .display 1321 #other-language .display
1108 { 1322 {
1109 -webkit-margin-start: 10px; 1323 -webkit-margin-start: 10px;
1110 -moz-margin-start: 10px; 1324 -moz-margin-start: 10px;
1111 } 1325 }
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