| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 input[type="text"], input[type="search"] | 88 input[type="text"], input[type="search"] |
| 89 { | 89 { |
| 90 -webkit-box-sizing: border-box; | 90 -webkit-box-sizing: border-box; |
| 91 -moz-box-sizing: border-box; | 91 -moz-box-sizing: border-box; |
| 92 box-sizing: border-box; | 92 box-sizing: border-box; |
| 93 } | 93 } |
| 94 | 94 |
| 95 .option-name | 95 .option-name |
| 96 { | 96 { |
| 97 display: flex; | 97 display: flex; |
| 98 margin-bottom: 16px; | |
| 99 margin-top: 24px; | |
| 98 } | 100 } |
| 99 | 101 |
| 100 .option-name > * | 102 .option-name > :first-child |
| 101 { | 103 { |
| 102 -moz-margin-end: 6px; | 104 flex: 1; |
| 103 -webkit-margin-end: 6px; | 105 overflow: hidden; |
| 106 text-overflow: ellipsis; | |
| 107 white-space: nowrap; | |
| 108 -moz-margin-end: auto; | |
|
saroyanm
2015/07/22 18:25:38
Why do we need "margin-end: auto;" here ?
Thomas Greiner
2015/07/28 14:13:07
Done. Seems to be redundant when using `flex: 1`.
| |
| 109 -webkit-margin-end: auto; | |
| 104 } | 110 } |
| 105 | 111 |
| 106 #nav-sidebar | 112 #nav-sidebar |
| 107 { | 113 { |
| 108 min-width: 198px; | 114 min-width: 198px; |
| 109 } | 115 } |
| 110 | 116 |
| 111 #nav-sidebar .fixed | 117 #nav-sidebar .fixed |
| 112 { | 118 { |
| 113 top: 40px; | 119 top: 40px; |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 133 margin: 0px; | 139 margin: 0px; |
| 134 padding: 8px 0px 16px 0px; | 140 padding: 8px 0px 16px 0px; |
| 135 } | 141 } |
| 136 | 142 |
| 137 .flex-container | 143 .flex-container |
| 138 { | 144 { |
| 139 display: flex; | 145 display: flex; |
| 140 flex-flow: row wrap; | 146 flex-flow: row wrap; |
| 141 } | 147 } |
| 142 | 148 |
| 149 .flex-container > div | |
|
saroyanm
2015/07/22 18:25:38
I do think this rule adding confusion, because thi
Thomas Greiner
2015/07/28 14:13:07
I'd rather avoid having implementation details suc
saroyanm
2015/07/28 17:21:42
Well it does bisect the row, but why each child di
Thomas Greiner
2015/07/28 18:19:22
I see your point. Hardcoding it to 400px is a bad
| |
| 150 { | |
| 151 width: 400px; | |
| 152 } | |
| 153 | |
| 143 .tabs li | 154 .tabs li |
| 144 { | 155 { |
| 145 cursor: pointer; | 156 cursor: pointer; |
| 146 display: flex; | 157 display: flex; |
| 147 } | 158 } |
| 148 | 159 |
| 149 .tabs li a | 160 .tabs li a |
| 150 { | 161 { |
| 151 flex: 1; | 162 flex: 1; |
| 152 color: inherit; | 163 color: inherit; |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 300 cursor: pointer; | 311 cursor: pointer; |
| 301 display: flex; | 312 display: flex; |
| 302 } | 313 } |
| 303 | 314 |
| 304 .table | 315 .table |
| 305 { | 316 { |
| 306 list-style: none; | 317 list-style: none; |
| 307 margin: 0px; | 318 margin: 0px; |
| 308 padding: 0px; | 319 padding: 0px; |
| 309 position: relative; | 320 position: relative; |
| 310 width: 400px; | |
| 311 } | 321 } |
| 312 | 322 |
| 313 .table li | 323 .table li |
| 314 { | 324 { |
| 315 display: flex; | 325 display: flex; |
| 316 padding: 14px 0px; | 326 padding: 14px 0px; |
| 317 -webkit-padding-start: 16px; | 327 -webkit-padding-start: 16px; |
| 318 -moz-padding-start: 16px; | 328 -moz-padding-start: 16px; |
| 319 } | 329 } |
| 320 | 330 |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 539 | 549 |
| 540 #blocking-languages, | 550 #blocking-languages, |
| 541 #acceptable-ads | 551 #acceptable-ads |
| 542 { | 552 { |
| 543 -moz-padding-end: 40px; | 553 -moz-padding-end: 40px; |
| 544 -webkit-padding-end: 40px; | 554 -webkit-padding-end: 40px; |
| 545 } | 555 } |
| 546 | 556 |
| 547 #custom-wrapper | 557 #custom-wrapper |
| 548 { | 558 { |
| 549 width: 400px; | |
| 550 height: 290px; | 559 height: 290px; |
| 551 overflow: auto; | 560 overflow: auto; |
| 552 } | 561 } |
| 553 | 562 |
| 554 #custom-wrapper .table | 563 #custom-wrapper .table |
| 555 { | 564 { |
| 556 width: 100%; | 565 width: 100%; |
| 557 } | 566 } |
| 558 | 567 |
| 559 #whitelisting .controls | 568 #whitelisting .controls |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 740 { | 749 { |
| 741 content: ""; | 750 content: ""; |
| 742 background-position: -28px -85px; | 751 background-position: -28px -85px; |
| 743 cursor: pointer; | 752 cursor: pointer; |
| 744 height: 10px; | 753 height: 10px; |
| 745 -webkit-margin-start: 6px; | 754 -webkit-margin-start: 6px; |
| 746 -moz-margin-start: 6px; | 755 -moz-margin-start: 6px; |
| 747 width: 10px; | 756 width: 10px; |
| 748 } | 757 } |
| 749 | 758 |
| 759 /* | |
| 760 Tooltips | |
| 761 */ | |
| 762 | |
| 750 .tooltip, #block-element-explanation a | 763 .tooltip, #block-element-explanation a |
|
saroyanm
2015/07/22 18:25:39
Why don't just add class ".tooltip" to "#block-ele
Thomas Greiner
2015/07/28 14:13:07
Yes, especially since this part of the page has no
| |
| 751 { | 764 { |
| 752 border-bottom: dotted 2px; | 765 border-bottom: dashed 1px; |
| 753 color: #3A7BA6; | 766 color: #3A7BA6; |
| 767 cursor: default; | |
| 754 font-size: 12px; | 768 font-size: 12px; |
| 769 height: 15px; | |
| 770 line-height: 19px; | |
| 771 margin: 0px 4px; | |
| 772 position: relative; | |
| 755 text-decoration: none; | 773 text-decoration: none; |
| 756 } | 774 } |
| 757 | 775 |
| 758 #content-advanced .tooltip | 776 #content-advanced .tooltip |
| 759 { | 777 { |
| 760 -moz-margin-start: 8px; | 778 -moz-margin-start: 8px; |
| 761 -webkit-margin-start: 8px; | 779 -webkit-margin-start: 8px; |
| 762 } | 780 } |
| 763 | 781 |
| 764 #block-element-explanation a | 782 #block-element-explanation a |
| 765 { | 783 { |
| 766 color: black; | 784 color: black; |
| 767 border-bottom-color: #3A7BA6; | 785 border-bottom-color: #3A7BA6; |
| 768 font-weight: 600; | 786 font-weight: 600; |
| 769 -moz-padding-start: 0px; | 787 -moz-padding-start: 0px; |
| 770 -webkit-padding-start: 0px; | 788 -webkit-padding-start: 0px; |
| 771 } | 789 } |
| 772 | 790 |
| 791 div[role="tooltip"] | |
| 792 { | |
| 793 background-color: rgba(45, 45, 45, 0.95); | |
| 794 border-radius: 3px; | |
| 795 color: #FFF; | |
| 796 font-size: 14px; | |
| 797 font-weight: 400; | |
| 798 line-height: 18px; | |
| 799 margin-top: 14px; | |
| 800 max-width: 400px; | |
|
saroyanm
2015/07/22 18:25:38
Why we use both max and min width ?
Please use "w
Thomas Greiner
2015/07/28 14:13:07
Done.
| |
| 801 min-width: 400px; | |
| 802 opacity: 1; | |
| 803 padding: 20px; | |
| 804 position: absolute; | |
| 805 transition: opacity 200ms ease-in-out 400ms; | |
|
saroyanm
2015/07/22 18:25:39
In case we will need to support safari 6.0 we will
Thomas Greiner
2015/07/28 14:13:07
According to MDN, `transition-delay` is still pref
| |
| 806 z-index: 1; | |
| 807 left: -20px; | |
| 808 } | |
| 809 | |
| 810 html[dir="ltr"] div[role="tooltip"].flip-vertical, | |
| 811 html[dir="rtl"] div[role="tooltip"]:not(.flip-vertical) | |
| 812 { | |
| 813 left: inherit; | |
| 814 right: -20px; | |
| 815 } | |
| 816 | |
| 817 .tooltip:not(:hover) > div[role="tooltip"], | |
| 818 div[role="tooltip"]:hover | |
|
saroyanm
2015/07/22 18:25:39
On small screens some tooltips overflow this eleme
Thomas Greiner
2015/07/28 14:13:07
Done. Nice catch!
| |
| 819 { | |
| 820 opacity: 0; | |
| 821 transition-delay: 0ms; | |
| 822 } | |
| 823 | |
| 824 div[role="tooltip"]::before | |
| 825 { | |
| 826 background-image: url(options-sprite.png); | |
| 827 background-position: -8px -42px; | |
| 828 content: ""; | |
| 829 height: 6px; | |
| 830 position: absolute; | |
| 831 top: -6px; | |
| 832 width: 14px; | |
| 833 left: 30px; | |
| 834 } | |
| 835 | |
| 836 html[dir="ltr"] div[role="tooltip"].flip-vertical::before, | |
| 837 html[dir="rtl"] div[role="tooltip"]:not(.flip-vertical)::before | |
| 838 { | |
| 839 left: inherit; | |
| 840 right: 30px; | |
| 841 } | |
| 842 | |
| 843 div[role="tooltip"] img | |
| 844 { | |
| 845 float: left; | |
| 846 height: 64px; | |
| 847 margin-top: -2px; | |
| 848 margin-bottom: 10px; | |
| 849 width: 64px; | |
| 850 -moz-margin-end: 10px; | |
| 851 -webkit-margin-end: 10px; | |
| 852 } | |
| 853 | |
| 854 html[dir="rtl"] div[role="tooltip"] img | |
| 855 { | |
| 856 float: right; | |
| 857 } | |
| 858 | |
| 859 div[role="tooltip"] > div:not(:first-of-type) | |
| 860 { | |
| 861 border-top: 1px solid #717171; | |
| 862 font-size: 12px; | |
| 863 font-weight: 300; | |
| 864 margin-top: 14px; | |
| 865 padding-top: 14px; | |
| 866 } | |
| 867 | |
| 868 div[role="tooltip"] > div > div:not(:first-child) | |
| 869 { | |
| 870 margin-top: 18px; | |
| 871 } | |
| 872 | |
| 773 /* | 873 /* |
| 774 Help tab content | 874 Help tab content |
| 775 */ | 875 */ |
| 776 | 876 |
| 777 #content-help | 877 #content-help |
| 778 { | 878 { |
| 779 counter-reset: section; | 879 counter-reset: section; |
| 780 } | 880 } |
| 781 | 881 |
| 782 #content-help h1::before | 882 #content-help h1::before |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 963 -moz-padding-end: 10px; | 1063 -moz-padding-end: 10px; |
| 964 -webkit-padding-start: 0px; | 1064 -webkit-padding-start: 0px; |
| 965 -moz-padding-start: 0px; | 1065 -moz-padding-start: 0px; |
| 966 } | 1066 } |
| 967 | 1067 |
| 968 #other-language .display | 1068 #other-language .display |
| 969 { | 1069 { |
| 970 -webkit-margin-start: 10px; | 1070 -webkit-margin-start: 10px; |
| 971 -moz-margin-start: 10px; | 1071 -moz-margin-start: 10px; |
| 972 } | 1072 } |
| OLD | NEW |