 Issue 29333819:
  Issue 2375 - Implement "Blocking lists" section in new options page  (Closed)
    
  
    Issue 29333819:
  Issue 2375 - Implement "Blocking lists" section in new options page  (Closed) 
  | Left: | ||
| Right: | 
| LEFT | RIGHT | 
|---|---|
| 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 381 } | 381 } | 
| 382 | 382 | 
| 383 .table.cols | 383 .table.cols | 
| 384 { | 384 { | 
| 385 border-bottom: 1px solid #CDCDCD; | 385 border-bottom: 1px solid #CDCDCD; | 
| 386 border-top: 1px solid #CDCDCD; | 386 border-top: 1px solid #CDCDCD; | 
| 387 } | 387 } | 
| 388 | 388 | 
| 389 button[disabled="true"] | 389 button[disabled="true"] | 
| 390 { | 390 { | 
| 391 border-radius: 2px; | |
| 391 background-color: #ccc; | 392 background-color: #ccc; | 
| 392 border-radius: 2px; | |
| 393 } | 393 } | 
| 394 | 394 | 
| 395 .table button.delete | 395 .table button.delete | 
| 396 { | 396 { | 
| 397 background-color: transparent; | 397 background-color: transparent; | 
| 398 background-position: -9px -32px; | 398 background-position: -9px -32px; | 
| 399 border: 0px; | 399 border: 0px; | 
| 400 height: 10px; | 400 height: 10px; | 
| 401 margin-top: 5px; | 401 margin-top: 5px; | 
| 402 -moz-margin-end: 20px; | 402 -moz-margin-end: 20px; | 
| (...skipping 15 matching lines...) Expand all Loading... | |
| 418 { | 418 { | 
| 419 display: flex; | 419 display: flex; | 
| 420 margin-bottom: 0px; | 420 margin-bottom: 0px; | 
| 421 padding: 0px; | 421 padding: 0px; | 
| 422 } | 422 } | 
| 423 | 423 | 
| 424 .tabs.horizontal li | 424 .tabs.horizontal li | 
| 425 { | 425 { | 
| 426 display: inline-block; | 426 display: inline-block; | 
| 427 border-bottom: 1px solid #A1A1A1; | 427 border-bottom: 1px solid #A1A1A1; | 
| 428 padding: 10px 46px; | |
| 428 color: #3A7BA6; | 429 color: #3A7BA6; | 
| 429 padding: 10px 46px; | |
| 430 text-align: center; | 430 text-align: center; | 
| 431 } | 431 } | 
| 432 | 432 | 
| 433 .icon, | 433 .icon, | 
| 434 button[role="checkbox"], | 434 button[role="checkbox"], | 
| 435 .table button.delete, | 435 .table button.delete, | 
| 436 #content-help a::before, | 436 #content-help a::before, | 
| 437 #dialog-close::before, | 437 #dialog-close::before, | 
| 438 #custom-filters-add button::after, | 438 #custom-filters-add button::after, | 
| 439 #dialog-body button::before, | 439 #dialog-body button::before, | 
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 610 { | 610 { | 
| 611 display: none; | 611 display: none; | 
| 612 } | 612 } | 
| 613 | 613 | 
| 614 body[data-tab="advanced-allFilterLists"] #all-filter-lists, | 614 body[data-tab="advanced-allFilterLists"] #all-filter-lists, | 
| 615 body[data-tab="advanced-customFilters"] #custom-filters | 615 body[data-tab="advanced-customFilters"] #custom-filters | 
| 616 { | 616 { | 
| 617 display: block; | 617 display: block; | 
| 618 } | 618 } | 
| 619 | 619 | 
| 620 body[data-tab="advanced-allFilterLists"] #content-advanced [data-tab="advanced-a llFilterLists"], | 620 body[data-tab="advanced-allFilterLists"] #content-advanced [data-tab="advanced-a llFilterLists"], | 
| 
Thomas Greiner
2016/02/01 18:52:37
Detail: Mentioning `#content-advanced` is redundan
 
saroyanm
2016/02/03 14:04:29
Done.
 
Thomas Greiner
2016/02/03 14:50:13
I noticed that this change introduces a regression
 
saroyanm
2016/02/03 17:43:11
Ach right, because we also specify same data-tab b
 | |
| 621 body[data-tab="advanced-customFilters"] #content-advanced [data-tab="advanced-cu stomFilters"] | 621 body[data-tab="advanced-customFilters"] #content-advanced [data-tab="advanced-cu stomFilters"] | 
| 622 { | 622 { | 
| 623 border-bottom: 2px solid #1E8728; | 623 border-bottom: 2px solid #1E8728; | 
| 624 padding-bottom: 10px; | 624 padding-bottom: 10px; | 
| 625 color: black; | 625 color: black; | 
| 626 font-weight: 600; | 626 font-weight: 600; | 
| 627 } | 627 } | 
| 628 | 628 | 
| 629 #all-filter-lists .table | 629 #all-filter-lists .table | 
| 630 { | 630 { | 
| 631 display: inline-block; | 631 display: inline-block; | 
| 632 } | 632 } | 
| 633 | 633 | 
| 634 #all-filter-lists .table li | 634 #all-filter-lists .table li | 
| 635 { | 635 { | 
| 636 padding-left: 16px; | 636 padding-left: 16px; | 
| 637 padding-right: 16px; | 637 padding-right: 16px; | 
| 638 } | 638 } | 
| 639 | 639 | 
| 640 #all-filter-lists .table li > span:first-of-type | 640 #all-filter-lists .table li > div | 
| 641 { | 641 { | 
| 642 display: inline-block; | 642 display: flex; | 
| 643 width: 330px; | 643 width: 330px; | 
| 644 } | 644 } | 
| 645 | 645 | 
| 646 .table-header | 646 .table-header | 
| 647 { | 647 { | 
| 648 display: flex; | 648 display: flex; | 
| 649 } | 649 } | 
| 650 | 650 | 
| 651 #filter-lists h3 | 651 #filter-lists h3 | 
| 652 { | 652 { | 
| (...skipping 26 matching lines...) Expand all Loading... | |
| 679 border-top: none; | 679 border-top: none; | 
| 680 } | 680 } | 
| 681 | 681 | 
| 682 #all-filter-lists .controls button | 682 #all-filter-lists .controls button | 
| 683 { | 683 { | 
| 684 margin-top: 14px; | 684 margin-top: 14px; | 
| 685 } | 685 } | 
| 686 | 686 | 
| 687 #all-filter-lists .arrow | 687 #all-filter-lists .arrow | 
| 688 { | 688 { | 
| 689 position: relative; | |
| 690 margin: auto 6px; | |
| 689 border-style: none; | 691 border-style: none; | 
| 690 position: relative; | |
| 
Thomas Greiner
2016/02/01 18:52:37
Detail: According to the coding style positioning
 
saroyanm
2016/02/03 14:04:30
Done.
 | |
| 691 padding: 0px; | 692 padding: 0px; | 
| 692 width: 6px; | 693 width: 6px; | 
| 693 height: 4px; | 694 height: 4px; | 
| 694 margin: 0px 4px; | |
| 
Thomas Greiner
2016/02/01 18:52:37
The reason why it looks odd to you to specify `6px
 
saroyanm
2016/02/03 14:04:28
Done, also changed the parent to be block level el
 | |
| 695 background-color: transparent; | |
| 
Thomas Greiner
2016/02/01 18:52:38
Detail: Why is that necessary?
 
saroyanm
2016/02/03 14:04:28
Redundant, do not remember why I have it here. Don
 | |
| 696 background-position: -1px -54px; | 695 background-position: -1px -54px; | 
| 697 cursor: pointer; | 696 cursor: pointer; | 
| 698 } | 697 } | 
| 699 | 698 | 
| 700 #all-filter-lists .table li:last-of-type a | 699 #all-filter-lists .table li:last-of-type a | 
| 701 { | 700 { | 
| 702 color: #3A7BA6; | 701 color: #3A7BA6; | 
| 703 text-decoration: none; | 702 text-decoration: none; | 
| 704 cursor: pointer; | 703 cursor: pointer; | 
| 705 } | 704 } | 
| 706 | 705 | 
| 707 #all-filter-lists .table li:last-of-type span:last-child | 706 #all-filter-lists .table li:last-of-type > span:last-child | 
| 708 { | 707 { | 
| 709 -webkit-margin-start: auto; | 708 -webkit-margin-start: auto; | 
| 710 -moz-margin-start: auto; | 709 -moz-margin-start: auto; | 
| 710 } | |
| 711 | |
| 712 #all-filter-lists li.show-message .date, | |
| 713 #all-filter-lists li.show-message .time, | |
| 714 #all-filter-lists li:not(.show-message) .message | |
| 715 { | |
| 716 display: none; | |
| 711 } | 717 } | 
| 712 | 718 | 
| 713 .date::before | 719 .date::before | 
| 714 { | 720 { | 
| 715 content: ""; | 721 content: ""; | 
| 716 -webkit-margin-end: 6px; | 722 -webkit-margin-end: 6px; | 
| 717 -moz-margin-end: 6px; | 723 -moz-margin-end: 6px; | 
| 718 height: 12px; | 724 height: 12px; | 
| 719 width: 12px; | 725 width: 12px; | 
| 720 background-position: -7px -49px; | 726 background-position: -7px -49px; | 
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 958 width: 14px; | 964 width: 14px; | 
| 959 left: 30px; | 965 left: 30px; | 
| 960 } | 966 } | 
| 961 | 967 | 
| 962 div.context-menu | 968 div.context-menu | 
| 963 { | 969 { | 
| 964 position: absolute; | 970 position: absolute; | 
| 965 top: 16px; | 971 top: 16px; | 
| 966 z-index: 1; | 972 z-index: 1; | 
| 967 visibility: hidden; | 973 visibility: hidden; | 
| 968 border-radius: 3px; | |
| 
Thomas Greiner
2016/02/01 18:52:37
Detail: Why did you move the border radius to here
 
saroyanm
2016/02/03 14:04:28
I think I didn't noticed that. moved to content.
 | |
| 969 } | 974 } | 
| 970 | 975 | 
| 971 div.context-menu::before | 976 div.context-menu::before | 
| 972 { | 977 { | 
| 973 left: -4px; | 978 left: -4px; | 
| 974 } | 979 } | 
| 975 | 980 | 
| 976 html[dir="rtl"] div.context-menu::before | 981 html[dir="rtl"] div.context-menu::before | 
| 977 { | 982 { | 
| 978 left: inherit; | 983 left: inherit; | 
| 979 right: -4px; | 984 right: -4px; | 
| 980 } | 985 } | 
| 981 | 986 | 
| 982 div.context-menu .content | 987 div.context-menu .content | 
| 
Thomas Greiner
2016/02/01 18:52:38
Detail: Please add `cursor: default` to avoid show
 
saroyanm
2016/02/03 14:04:27
Done.
 | |
| 983 { | 988 { | 
| 984 position: relative; | 989 position: relative; | 
| 985 left: calc(-50% + 2px); | 990 left: calc(-50% + 2px); | 
| 991 border-radius: 3px; | |
| 992 padding: 4px 10px; | |
| 986 background-color: rgba(45, 45, 45, 0.95); | 993 background-color: rgba(45, 45, 45, 0.95); | 
| 987 padding: 4px 10px; | 994 cursor: default; | 
| 988 } | 995 } | 
| 989 | 996 | 
| 990 html[dir="rtl"] div.context-menu .content | 997 html[dir="rtl"] div.context-menu .content | 
| 991 { | 998 { | 
| 992 left: inherit; | 999 left: inherit; | 
| 993 right: -50%; | 1000 right: -50%; | 
| 994 } | 1001 } | 
| 995 | 1002 | 
| 996 li.show-context-menu div.context-menu | 1003 li.show-context-menu div.context-menu | 
| 997 { | 1004 { | 
| 998 visibility: visible; | 1005 visibility: visible; | 
| 999 } | 1006 } | 
| 1000 | 1007 | 
| 1001 div.context-menu > div a::before | 1008 div.context-menu > div a::before | 
| 1002 { | 1009 { | 
| 1003 content: ""; | 1010 content: ""; | 
| 1004 -moz-margin-end: 8px; | 1011 -moz-margin-end: 8px; | 
| 1005 -webkit-margin-end: 8px; | 1012 -webkit-margin-end: 8px; | 
| 1006 } | 1013 } | 
| 1007 | 1014 | 
| 1008 div.context-menu > div a | 1015 div.context-menu > div a | 
| 1009 { | 1016 { | 
| 1010 display: block; | 1017 display: block; | 
| 1011 text-decoration: none; | |
| 
Thomas Greiner
2016/02/01 18:52:36
Detail: This property is in the wrong spot accordi
 
saroyanm
2016/02/03 14:04:29
Done.
 | |
| 1012 padding: 7px 4px; | 1018 padding: 7px 4px; | 
| 1013 border-bottom: 1px solid #CDCDCD; | 1019 border-bottom: 1px solid #CDCDCD; | 
| 1020 text-decoration: none; | |
| 1014 cursor: pointer; | 1021 cursor: pointer; | 
| 1015 vertical-align: middle; | 1022 vertical-align: middle; | 
| 1016 } | 1023 } | 
| 1017 | 1024 | 
| 1018 div.context-menu > div a:before | 1025 div.context-menu > div a::before | 
| 
Thomas Greiner
2016/02/01 18:52:38
Detail: Replace ":before" with "::before" to make
 
saroyanm
2016/02/03 14:04:29
Done.
 | |
| 1019 { | 1026 { | 
| 1020 vertical-align: middle; | 1027 vertical-align: middle; | 
| 1021 height: 16px; | 1028 height: 16px; | 
| 1022 width: 16px; | 1029 width: 16px; | 
| 1023 } | 1030 } | 
| 1024 | 1031 | 
| 1025 div.context-menu > div a:last-child | 1032 div.context-menu > div a:last-child | 
| 1026 { | 1033 { | 
| 1027 border: none; | 1034 border: none; | 
| 1028 } | 1035 } | 
| 1029 | 1036 | 
| 1030 .context-menu .update-now::before | 1037 .context-menu .update-subscription::before | 
| 1031 { | 1038 { | 
| 1032 background-position: -38px -31px; | 1039 background-position: -38px -31px; | 
| 1033 } | 1040 } | 
| 1034 | 1041 | 
| 1035 .context-menu .website::before | 1042 .context-menu .website::before | 
| 1036 { | 1043 { | 
| 1037 background-position: -33px -47px; | 1044 background-position: -33px -47px; | 
| 1038 } | 1045 } | 
| 1039 | 1046 | 
| 1040 .context-menu .source::before | 1047 .context-menu .source::before | 
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1305 #other-language .button-add::before | 1312 #other-language .button-add::before | 
| 1306 { | 1313 { | 
| 1307 display: none; | 1314 display: none; | 
| 1308 } | 1315 } | 
| 1309 | 1316 | 
| 1310 #other-language .display | 1317 #other-language .display | 
| 1311 { | 1318 { | 
| 1312 -webkit-margin-start: 10px; | 1319 -webkit-margin-start: 10px; | 
| 1313 -moz-margin-start: 10px; | 1320 -moz-margin-start: 10px; | 
| 1314 } | 1321 } | 
| LEFT | RIGHT |