 Issue 29321198:
  Issue 2376 - Implement custom filters in new options page  (Closed)
    
  
    Issue 29321198:
  Issue 2376 - Implement custom filters in new options page  (Closed) 
  | Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 border: 0px; | 47 border: 0px; | 
| 48 height: 1px; | 48 height: 1px; | 
| 49 margin: 0px; | 49 margin: 0px; | 
| 50 } | 50 } | 
| 51 | 51 | 
| 52 input[type="search"]::-webkit-search-cancel-button | 52 input[type="search"]::-webkit-search-cancel-button | 
| 53 { | 53 { | 
| 54 display: none; | 54 display: none; | 
| 55 } | 55 } | 
| 56 | 56 | 
| 57 input[type="text"], input[type="search"] | |
| 58 { | |
| 59 -webkit-box-sizing: border-box; | |
| 60 -moz-box-sizing: border-box; | |
| 61 box-sizing: border-box; | |
| 
Thomas Greiner
2015/06/30 09:23:29
What about applying `box-sizing:border-box` to eve
 
saroyanm
2015/07/08 18:25:43
I think it make sense to create a separate ticket
 
Thomas Greiner
2015/07/09 11:07:54
Fine with me.
 | |
| 62 } | |
| 63 | |
| 57 .option-name | 64 .option-name | 
| 58 { | 65 { | 
| 59 display: flex; | 66 display: flex; | 
| 60 } | 67 } | 
| 61 | 68 | 
| 62 .option-name > * | 69 .option-name > * | 
| 63 { | 70 { | 
| 64 -moz-margin-end: 6px; | 71 -moz-margin-end: 6px; | 
| 65 -webkit-margin-end: 6px; | 72 -webkit-margin-end: 6px; | 
| 66 } | 73 } | 
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 415 | 422 | 
| 416 .tabs.horizontal li.active | 423 .tabs.horizontal li.active | 
| 417 { | 424 { | 
| 418 border-bottom: 2px solid #1E8728; | 425 border-bottom: 2px solid #1E8728; | 
| 419 color: black; | 426 color: black; | 
| 420 font-weight: bold; | 427 font-weight: bold; | 
| 421 padding-bottom: 10px; | 428 padding-bottom: 10px; | 
| 422 } | 429 } | 
| 423 | 430 | 
| 424 .icon, .table input[type="checkbox"]::before, .table button.delete, | 431 .icon, .table input[type="checkbox"]::before, .table button.delete, | 
| 425 #content-help a::before, #dialog-close::before | 432 #content-help a::before, #dialog-close::before, | 
| 433 #custom-filters-add-btn::after | |
| 426 { | 434 { | 
| 427 background-image: url(options-sprite.png); | 435 background-image: url(options-sprite.png); | 
| 428 display: inline-block; | 436 display: inline-block; | 
| 429 } | 437 } | 
| 430 | 438 | 
| 431 .icon-add | 439 .icon-add | 
| 432 { | 440 { | 
| 433 background-position: -0px -0px; | 441 background-position: -0px -0px; | 
| 434 cursor: pointer; | 442 cursor: pointer; | 
| 435 height: 18px; | 443 height: 18px; | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 530 { | 538 { | 
| 531 border: 0px; | 539 border: 0px; | 
| 532 border-bottom: 1px solid #A1A1A1; | 540 border-bottom: 1px solid #A1A1A1; | 
| 533 -moz-padding-end: 25px; | 541 -moz-padding-end: 25px; | 
| 534 -webkit-padding-end: 25px; | 542 -webkit-padding-end: 25px; | 
| 535 -moz-margin-start: 14px; | 543 -moz-margin-start: 14px; | 
| 536 -webkit-margin-start: 14px; | 544 -webkit-margin-start: 14px; | 
| 537 outline: 0px; | 545 outline: 0px; | 
| 538 padding-bottom: 5px; | 546 padding-bottom: 5px; | 
| 539 vertical-align: text-bottom; | 547 vertical-align: text-bottom; | 
| 540 width: 330px; | 548 width: 355px; | 
| 
Thomas Greiner
2015/06/30 09:23:30
Could you please try making this more dynamic inst
 
saroyanm
2015/07/08 18:25:42
Done, but I do not understand why it's overlapping
 
Thomas Greiner
2015/07/09 11:07:55
It seems that #whitelisting-add-icon's width is lo
 
saroyanm
2015/07/09 16:31:40
Done.
 | |
| 541 } | 549 } | 
| 542 | 550 | 
| 543 #whitelisting .controls .button-add span | 551 #whitelisting .controls .button-add span | 
| 544 { | 552 { | 
| 545 -moz-margin-start: 5px; | 553 -moz-margin-start: 5px; | 
| 546 -webkit-margin-start: 5px; | 554 -webkit-margin-start: 5px; | 
| 547 } | 555 } | 
| 548 | 556 | 
| 549 #whitelisting .button-add | 557 #whitelisting .button-add | 
| 550 { | 558 { | 
| (...skipping 23 matching lines...) Expand all Loading... | |
| 574 background-color: transparent; | 582 background-color: transparent; | 
| 575 border: 0px; | 583 border: 0px; | 
| 576 color: #3A7BA6; | 584 color: #3A7BA6; | 
| 577 cursor: pointer; | 585 cursor: pointer; | 
| 578 } | 586 } | 
| 579 | 587 | 
| 580 /* | 588 /* | 
| 581 Advanced tab content | 589 Advanced tab content | 
| 582 */ | 590 */ | 
| 583 | 591 | 
| 584 #blocking-list-own .table | 592 #custom-filters-header | 
| 593 { | |
| 594 -moz-margin-start: 20px; | |
| 595 -webkit-margin-start: 20px; | |
| 
Thomas Greiner
2015/06/30 09:23:29
What about `padding: 0px 20px;` instead? We want t
 
saroyanm
2015/07/08 18:25:43
Done.
 | |
| 596 margin-bottom: 10px; | |
| 597 } | |
| 598 | |
| 599 #custom-filters-textarea-controls, #custom-filters-edit-btn, | |
| 600 #custom-filters-list-wrapper, #custom-filters-textarea | |
| 601 { | |
| 602 display: none; | |
| 603 } | |
| 604 | |
| 605 #custom-filters[data-view="edit"] #custom-filters-textarea, | |
| 606 #custom-filters[data-view="list"] #custom-filters-edit-btn, | |
| 607 #custom-filters[data-view="list"] #custom-filters-list-wrapper | |
| 
Thomas Greiner
2015/06/30 09:23:29
You could combine this, the block above and the bl
 
saroyanm
2015/07/08 18:25:42
Done.
 | |
| 608 { | |
| 609 display: block; | |
| 610 } | |
| 611 | |
| 612 #custom-filters[data-view="edit"] #custom-filters-textarea-controls | |
| 613 { | |
| 614 display: flex; | |
| 615 } | |
| 616 | |
| 617 #custom-filters-save-btn | |
| 618 { | |
| 619 -moz-margin-start: 16px; | |
| 620 -webkit-margin-start: 16px; | |
| 
Thomas Greiner
2015/06/30 09:23:30
Again, what about `padding: 0px 16px;` instead?
 
saroyanm
2015/07/08 18:25:42
Done.
 | |
| 621 } | |
| 622 | |
| 623 #custom-filters .table | |
| 585 { | 624 { | 
| 586 height: 290px; | 625 height: 290px; | 
| 587 overflow: auto; | 626 overflow: auto; | 
| 588 width: auto; | 627 width: auto; | 
| 589 } | 628 } | 
| 590 | 629 | 
| 591 #blocking-list-own .controls | 630 #custom-filter-add-wrapper | 
| 592 { | 631 { | 
| 593 display: flex; | 632 display: flex; | 
| 594 padding: 0px; | 633 padding: 0px; | 
| 595 border: none; | 634 border: none; | 
| 596 } | 635 } | 
| 597 | 636 | 
| 598 #blocking-list-own input[type="text"], | 637 #custom-filters .controls | 
| 599 #blocking-list-own input[type="text"]:focus | |
| 600 { | 638 { | 
| 601 border: 0px; | 639 border-top: none; | 
| 602 border-bottom: 1px solid; | 640 } | 
| 603 border-top: 1px solid; | 641 | 
| 642 #custom-filters-textarea | |
| 643 { | |
| 644 width: 100%; | |
| 645 height: 328px; | |
| 
Thomas Greiner
2015/06/30 09:23:30
I assume you'll make this pixel value more dynamic
 
saroyanm
2015/07/08 18:25:43
Couldn't find better way to achieve this, currentl
 | |
| 646 } | |
| 647 | |
| 648 #custom-filters input[type="text"], | |
| 649 #custom-filters input[type="text"]:focus | |
| 
Thomas Greiner
2015/06/30 09:23:29
Please split up those two styles. I assume `:focus
 
saroyanm
2015/07/08 18:25:42
Done.
 | |
| 650 { | |
| 651 border-width: 1px 0px 1px 0px; | |
| 652 border-bottom-style: solid; | |
| 653 border-top-style: solid; | |
| 604 border-color: #1E8728; | 654 border-color: #1E8728; | 
| 605 box-sizing: border-box; | |
| 606 height: 25px; | 655 height: 25px; | 
| 607 outline: 0px; | 656 outline: 0px; | 
| 608 -moz-padding-start: 10px; | 657 -moz-padding-start: 10px; | 
| 609 -webkit-padding-start: 10px; | 658 -webkit-padding-start: 10px; | 
| 659 -moz-padding-end: 60px; | |
| 660 -webkit-padding-end: 60px; | |
| 661 padding-top: 18px; | |
| 662 padding-bottom: 18px; | |
| 610 width: 100%; | 663 width: 100%; | 
| 611 } | 664 } | 
| 612 | 665 | 
| 613 .icon-enter-blue | 666 #custom-filters-add-textbox | 
| 614 { | 667 { | 
| 615 background-position: -28px -85px; | 668 font-size: 13px; | 
| 
Thomas Greiner
2015/06/30 09:23:30
Missing background color which is specified in des
 
saroyanm
2015/07/08 18:25:42
Done.
 | |
| 616 cursor: pointer; | |
| 617 height: 10px; | |
| 618 margin: 0px 0px -2px 2px; | |
| 619 width: 10px; | |
| 620 } | 669 } | 
| 621 | 670 | 
| 622 #blocking-list-own .input-control | 671 #custom-filters-add-textbox::-webkit-input-placeholder | 
| 623 { | 672 { | 
| 624 position: absolute; | 673 font-weight: bold; | 
| 
Thomas Greiner
2015/06/30 09:23:29
Actually, we don't have fonts for bold (= `font-we
 
saroyanm
2015/07/08 18:25:43
Done.
 | |
| 625 -webkit-margin-start: -50px; | 674 } | 
| 626 -moz-margin-start: -50px; | 675 #custom-filters-add-textbox::-moz-placeholder | 
| 627 bottom: 5px; | 676 { | 
| 677 font-weight: bold; | |
| 628 } | 678 } | 
| 629 | 679 | 
| 630 #blocking-list-own .input-separator | 680 #custom-filters-table | 
| 631 { | 681 { | 
| 682 border-top: 1px solid #CDCDCD; | |
| 683 } | |
| 684 | |
| 685 #custom-filters-add-btn | |
| 
Thomas Greiner
2015/06/30 09:23:29
The add-button doesn't occupy the entire block it'
 
saroyanm
2015/07/08 18:25:42
Done.
 
Thomas Greiner
2015/07/09 11:07:54
It still doesn't register it when you click on the
 
saroyanm
2015/07/09 16:31:40
Done.
 | |
| 686 { | |
| 687 font-size: 14px; | |
| 688 position: absolute; | |
| 
Thomas Greiner
2015/06/30 09:23:29
Doesn't this also work without `position:absolute`
 
saroyanm
2015/07/08 18:25:42
Exactly and they are fixing comment above :)
 | |
| 689 -webkit-margin-start: -60px; | |
| 690 -moz-margin-start: -60px; | |
| 691 bottom: 11px; | |
| 692 cursor: pointer; | |
| 693 color: #3A7BA6; | |
| 694 } | |
| 695 | |
| 696 #custom-filters-add-btn::before | |
| 697 { | |
| 698 content: ""; | |
| 632 display: inline-block; | 699 display: inline-block; | 
| 633 -moz-border-end: 1px solid #CDCDCD; | 700 -moz-border-end: 1px solid #CDCDCD; | 
| 634 -webkit-border-end: 1px solid #CDCDCD; | 701 -webkit-border-end: 1px solid #CDCDCD; | 
| 635 height: 15px; | 702 height: 15px; | 
| 636 margin: 0px 4px -4px 0px; | 703 -webkit-margin-end: 10px; | 
| 704 -moz-margin-end: 10px; | |
| 705 margin-bottom: -2px; | |
| 637 width: 1px; | 706 width: 1px; | 
| 638 } | 707 } | 
| 639 | 708 | 
| 640 #blocking-list-own .input-button-text | 709 #custom-filters-add-btn::after | 
| 
saroyanm
2015/06/29 11:34:18
I do think we need to show icon for other buttons
 
Thomas Greiner
2015/06/30 09:23:29
Yep, agreed. I guess you already confirmed in http
 | |
| 641 { | 710 { | 
| 642 font-size: 12px; | 711 content: ""; | 
| 712 background-position: -28px -85px; | |
| 713 cursor: pointer; | |
| 714 height: 10px; | |
| 715 -webkit-margin-start: 6px; | |
| 716 -moz-margin-start: 6px; | |
| 717 width: 10px; | |
| 643 } | 718 } | 
| 644 | 719 | 
| 645 .tooltip, #block-element-explanation a | 720 .tooltip, #block-element-explanation a | 
| 646 { | 721 { | 
| 647 border-bottom: dotted 2px; | 722 border-bottom: dotted 2px; | 
| 648 color: #3A7BA6; | 723 color: #3A7BA6; | 
| 649 font-size: 12px; | 724 font-size: 12px; | 
| 650 text-decoration: none; | 725 text-decoration: none; | 
| 651 } | 726 } | 
| 652 | 727 | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 772 | 847 | 
| 773 #dialog h3 | 848 #dialog h3 | 
| 774 { | 849 { | 
| 775 font-size: 14px; | 850 font-size: 14px; | 
| 776 margin: 0px; | 851 margin: 0px; | 
| 777 } | 852 } | 
| 778 | 853 | 
| 779 #dialog input[type="text"], | 854 #dialog input[type="text"], | 
| 780 #dialog input[type="search"] | 855 #dialog input[type="search"] | 
| 781 { | 856 { | 
| 782 -webkit-box-sizing: border-box; | |
| 783 -moz-box-sizing: border-box; | |
| 784 box-sizing: border-box; | |
| 785 font-size: 16px; | 857 font-size: 16px; | 
| 786 margin-top: 10px; | 858 margin-top: 10px; | 
| 787 padding: 5px; | 859 padding: 5px; | 
| 788 width: 100%; | 860 width: 100%; | 
| 789 } | 861 } | 
| 790 | 862 | 
| 791 #dialog .table | 863 #dialog .table | 
| 792 { | 864 { | 
| 793 width: 100%; | 865 width: 100%; | 
| 794 } | 866 } | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 867 -moz-padding-end: 10px; | 939 -moz-padding-end: 10px; | 
| 868 -webkit-padding-start: 0px; | 940 -webkit-padding-start: 0px; | 
| 869 -moz-padding-start: 0px; | 941 -moz-padding-start: 0px; | 
| 870 } | 942 } | 
| 871 | 943 | 
| 872 #other-language .display | 944 #other-language .display | 
| 873 { | 945 { | 
| 874 -webkit-margin-start: 10px; | 946 -webkit-margin-start: 10px; | 
| 875 -moz-margin-start: 10px; | 947 -moz-margin-start: 10px; | 
| 876 } | 948 } | 
| OLD | NEW |