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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 @font-face | |
19 { | |
20 font-family: "Source Sans Pro"; | |
21 src: url(fonts/SourceSansPro-Light.woff) format("woff"); | |
saroyanm
2015/07/09 12:56:33
I think we can use local to force local system fon
Thomas Greiner
2015/07/09 16:42:46
Not sure whether I understand what you mean. Using
saroyanm
2015/07/09 17:48:14
This solution is for being sure that no local font
Thomas Greiner
2015/07/10 09:48:14
Done.
| |
22 font-weight: 300; | |
23 font-style: normal; | |
24 } | |
25 | |
26 @font-face | |
27 { | |
28 font-family: "Source Sans Pro"; | |
29 src: url(fonts/SourceSansPro-Regular.woff) format("woff"); | |
30 font-weight: 400; | |
31 font-style: normal; | |
32 } | |
33 | |
34 @font-face | |
35 { | |
36 font-family: "Source Sans Pro"; | |
37 src: url(fonts/SourceSansPro-Semibold.woff) format("woff"); | |
38 font-weight: 600; | |
39 font-style: normal; | |
40 } | |
41 | |
18 body | 42 body |
19 { | 43 { |
20 background-color: #F5F5F5; | 44 background-color: #F5F5F5; |
21 display: flex; | 45 display: flex; |
46 margin: 20px 10px; | |
22 font-family: "Source Sans Pro", sans-serif; | 47 font-family: "Source Sans Pro", sans-serif; |
23 font-size: 14px; | 48 font-size: 14px; |
24 white-space: nowrap; | |
25 } | 49 } |
26 | 50 |
27 h1 | 51 h1 |
28 { | 52 { |
29 font-size: 24px; | 53 font-size: 24px; |
30 font-weight: 100; | 54 line-height: 1em; |
55 font-weight: 300; | |
31 } | 56 } |
32 | 57 |
33 h2 | 58 h2 |
34 { | 59 { |
35 font-size: 16px; | 60 font-size: 16px; |
36 font-weight: 500; | 61 font-weight: 600; |
37 } | 62 } |
38 | 63 |
39 p | 64 p |
40 { | 65 { |
41 font-weight: 100; | 66 font-weight: 300; |
42 } | 67 } |
43 | 68 |
44 hr | 69 hr |
45 { | 70 { |
46 background-color: #CDCDCD; | 71 background-color: #CDCDCD; |
47 border: 0px; | 72 border: 0px; |
48 height: 1px; | 73 height: 1px; |
49 margin: 0px; | 74 margin: 0px; |
50 } | 75 } |
51 | 76 |
52 input[type="search"]::-webkit-search-cancel-button | 77 input[type="search"]::-webkit-search-cancel-button |
53 { | 78 { |
54 display: none; | 79 display: none; |
55 } | 80 } |
56 | 81 |
57 .option-name | 82 .option-name |
58 { | 83 { |
59 display: flex; | 84 display: flex; |
60 } | 85 } |
61 | 86 |
62 .option-name > * | 87 .option-name > * |
63 { | 88 { |
64 -moz-margin-end: 6px; | 89 -moz-margin-end: 6px; |
65 -webkit-margin-end: 6px; | 90 -webkit-margin-end: 6px; |
66 } | 91 } |
67 | 92 |
68 #nav-sidebar | 93 #nav-sidebar |
69 { | 94 { |
70 position: relative; | |
71 padding: 0px 0px 16px 0px; | |
72 -moz-padding-start: 10px; | |
73 -webkit-padding-start: 10px; | |
74 min-width: 198px; | 95 min-width: 198px; |
75 } | 96 } |
76 | 97 |
77 #nav-sidebar .fixed | 98 #nav-sidebar .fixed |
78 { | 99 { |
79 height: 100%; | 100 top: 40px; |
101 bottom: 2px; | |
102 height: auto; | |
80 position: fixed; | 103 position: fixed; |
81 } | 104 } |
82 | 105 |
83 #page-title | 106 #page-title |
84 { | 107 { |
85 -webkit-margin-start: 10px; | 108 padding: 0px 20px; |
86 -moz-margin-start: 10px; | |
87 } | 109 } |
88 | 110 |
89 #page-title p | 111 #page-title p |
90 { | 112 { |
91 margin: 0px; | 113 margin: 0px; |
92 padding: 40px 0px 0px 0px; | |
93 font-size: 16px; | 114 font-size: 16px; |
115 line-height: 1em; | |
94 } | 116 } |
95 | 117 |
96 #page-title h1 | 118 #page-title h1 |
97 { | 119 { |
98 margin: 0px; | 120 margin: 0px; |
99 padding: 8px 0px 16px 0px; | 121 padding: 8px 0px 16px 0px; |
100 } | 122 } |
101 | 123 |
102 .flex-container | 124 .flex-container |
103 { | 125 { |
104 display: flex; | 126 display: flex; |
105 flex-flow: row wrap; | 127 flex-flow: row wrap; |
106 } | 128 } |
107 | 129 |
108 .tabs li | 130 .tabs li |
109 { | 131 { |
110 cursor: pointer; | 132 cursor: pointer; |
111 display: flex; | 133 display: flex; |
112 } | 134 } |
113 | 135 |
114 .tabs li a:first-child | 136 .tabs li a |
115 { | 137 { |
116 flex: 1; | 138 flex: 1; |
117 color: inherit; | 139 color: inherit; |
118 text-decoration: none; | 140 text-decoration: none; |
119 } | 141 } |
120 | 142 |
121 .tabs.vertical | 143 .tabs.vertical |
122 { | 144 { |
123 list-style: none; | 145 list-style: none; |
124 margin: 0px; | 146 margin: 0px; |
125 position: relative; | 147 position: relative; |
126 padding: 0px; | 148 padding: 0px; |
127 width: 198px; | 149 width: 198px; |
128 } | 150 } |
129 | 151 |
130 .tabs.vertical li | 152 .tabs.vertical li |
131 { | 153 { |
132 border-color: #CDCDCD; | 154 border-color: #CDCDCD transparent; |
133 border-style: solid; | 155 border-style: solid; |
134 border-width: 1px 0px 0px 0px; | 156 border-width: 1px; |
135 font-size: 16px; | 157 font-size: 16px; |
136 font-weight: 100; | 158 font-weight: 300; |
137 padding: 16px 0px; | 159 line-height: 1em; |
138 -moz-padding-end: 20px; | 160 margin-top: -1px; |
139 -webkit-padding-end: 20px; | 161 padding: 14px 20px; |
140 -moz-padding-start: 11px; | |
141 -webkit-padding-start: 11px; | |
142 } | |
143 | |
144 body[data-tab="general"] #tab-general + li, | |
145 body[data-tab="advanced"] #tab-advanced + li, | |
146 body[data-tab="help"] #tab-help + li | |
147 { | |
148 border-width: 0px; | |
149 } | |
150 | |
151 #tab-help, | |
152 body[data-tab="advanced"] #tab-advanced + li | |
153 { | |
154 border-bottom-width: 1px; | |
155 } | 162 } |
156 | 163 |
157 body[data-tab="general"] #tab-general, | 164 body[data-tab="general"] #tab-general, |
saroyanm
2015/07/09 12:56:33
during "RTL" direction the active tab's "start" bo
Thomas Greiner
2015/07/09 16:42:46
Done.
| |
158 body[data-tab="advanced"] #tab-advanced, | 165 body[data-tab="advanced"] #tab-advanced, |
159 body[data-tab="help"] #tab-help | 166 body[data-tab="help"] #tab-help |
160 { | 167 { |
161 background-color: #FFFFFF; | 168 background-color: #FFFFFF; |
162 border-radius: 3px 0px 0px 3px; | 169 border-radius: 3px 0px 0px 3px; |
163 border-width: 1px; | 170 border-width: 1px; |
164 -moz-border-end: 0px; | 171 -moz-border-start-color: #CDCDCD; |
165 -webkit-border-end: 0px; | 172 -webkit-border-start-color: #CDCDCD; |
166 font-weight: 900; | |
167 -moz-margin-end: -1px; | 173 -moz-margin-end: -1px; |
168 -webkit-margin-end: -1px; | 174 -webkit-margin-end: -1px; |
169 -moz-padding-start: 10px; | 175 font-weight: 600; |
170 -webkit-padding-start: 10px; | 176 -moz-padding-end: 21px; |
171 position: relative; | 177 -webkit-padding-end: 21px; |
178 } | |
179 | |
180 html[dir="rtl"] body[data-tab="general"] #tab-general, | |
181 html[dir="rtl"] body[data-tab="advanced"] #tab-advanced, | |
182 html[dir="rtl"] body[data-tab="help"] #tab-help | |
183 { | |
184 border-radius: 0px 3px 3px 0px; | |
172 } | 185 } |
173 | 186 |
174 .tabs.vertical.bottom | 187 .tabs.vertical.bottom |
175 { | 188 { |
176 bottom: 0px; | 189 bottom: 0px; |
177 position: absolute; | 190 position: absolute; |
178 } | 191 } |
179 | 192 |
180 .tabs.vertical.bottom li:first-child | 193 .tabs.vertical.bottom li:first-child |
181 { | 194 { |
182 border-top: 0px; | 195 border-top: 0px; |
183 } | 196 } |
184 | 197 |
185 .tabs.vertical .icon | 198 #tab-contribute |
186 { | 199 { |
187 margin: 2px 0px 0px 0px; | 200 border-bottom: none; |
201 } | |
202 | |
203 #nav-sidebar ul li .icon | |
204 { | |
205 height: 14px; | |
saroyanm
2015/07/09 12:56:33
Maybe
height: 15px;
width: 15px;
But it still nee
Thomas Greiner
2015/07/09 16:42:46
Yes, some icons are cut off because the values of
saroyanm
2015/07/09 17:48:14
What about changing the the height and width of si
Thomas Greiner
2015/07/10 09:48:14
According to the style guide the icons are suppose
| |
206 width: 14px; | |
188 } | 207 } |
189 | 208 |
190 #tab-general .icon | 209 #tab-general .icon |
191 { | 210 { |
192 background-position: -15px -17px; | 211 background-position: -16px -18px; |
193 height: 16px; | |
194 width: 16px; | |
195 } | 212 } |
196 | 213 |
197 #tab-advanced .icon | 214 #tab-advanced .icon |
198 { | 215 { |
199 background-position: -45px -18px; | 216 background-position: -46px -18px; |
200 height: 16px; | |
201 width: 16px; | |
202 } | 217 } |
203 | 218 |
204 #tab-help .icon | 219 #tab-help .icon |
205 { | 220 { |
206 background-position: 0px -17px; | 221 background-position: -1px -18px; |
207 height: 16px; | |
208 width: 16px; | |
209 } | 222 } |
210 | 223 |
211 #tab-share .icon | 224 #tab-share .icon |
212 { | 225 { |
213 background-position: -60px -17px; | 226 background-position: -61px -18px; |
214 height: 16px; | |
215 width: 16px; | |
216 } | 227 } |
217 | 228 |
218 #tab-contribute .icon | 229 #tab-contribute .icon |
219 { | 230 { |
220 background-position: -30px -17px; | 231 background-position: -31px -18px; |
221 height: 16px; | |
222 width: 16px; | |
223 } | 232 } |
224 | 233 |
225 #tab-content | 234 #tab-content |
226 { | 235 { |
227 background-color: #FFFFFF; | 236 background-color: #FFFFFF; |
228 border: 1px solid #CDCDCD; | 237 border: 1px solid #CDCDCD; |
229 border-radius: 8px; | 238 border-radius: 8px; |
230 padding: 0px 60px 40px 60px; | 239 padding: 0px 60px 40px 60px; |
231 width: 960px; | 240 width: 960px; |
232 } | 241 } |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
419 color: #3A7BA6; | 428 color: #3A7BA6; |
420 padding: 10px 0px 11px 0px; | 429 padding: 10px 0px 11px 0px; |
421 text-align: center; | 430 text-align: center; |
422 width: 50%; | 431 width: 50%; |
423 } | 432 } |
424 | 433 |
425 .tabs.horizontal li.active | 434 .tabs.horizontal li.active |
426 { | 435 { |
427 border-bottom: 2px solid #1E8728; | 436 border-bottom: 2px solid #1E8728; |
428 color: black; | 437 color: black; |
429 font-weight: bold; | 438 font-weight: 600; |
430 padding-bottom: 10px; | 439 padding-bottom: 10px; |
431 } | 440 } |
432 | 441 |
433 .icon, .table input[type="checkbox"]::before, .table button.delete, | 442 .icon, .table input[type="checkbox"]::before, .table button.delete, |
434 #content-help a::before, #dialog-close::before | 443 #content-help a::before, #dialog-close::before |
435 { | 444 { |
436 background-image: url(options-sprite.png); | 445 background-image: url(options-sprite.png); |
437 display: inline-block; | 446 display: inline-block; |
438 } | 447 } |
439 | 448 |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
662 #content-advanced .tooltip | 671 #content-advanced .tooltip |
663 { | 672 { |
664 -moz-margin-start: 8px; | 673 -moz-margin-start: 8px; |
665 -webkit-margin-start: 8px; | 674 -webkit-margin-start: 8px; |
666 } | 675 } |
667 | 676 |
668 #block-element-explanation a | 677 #block-element-explanation a |
669 { | 678 { |
670 color: black; | 679 color: black; |
671 border-bottom-color: #3A7BA6; | 680 border-bottom-color: #3A7BA6; |
672 font-weight: bold; | 681 font-weight: 600; |
673 -moz-padding-start: 0px; | 682 -moz-padding-start: 0px; |
674 -webkit-padding-start: 0px; | 683 -webkit-padding-start: 0px; |
675 } | 684 } |
676 | 685 |
677 /* | 686 /* |
678 Help tab content | 687 Help tab content |
679 */ | 688 */ |
680 | 689 |
681 #content-help | 690 #content-help |
682 { | 691 { |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
876 -moz-padding-end: 10px; | 885 -moz-padding-end: 10px; |
877 -webkit-padding-start: 0px; | 886 -webkit-padding-start: 0px; |
878 -moz-padding-start: 0px; | 887 -moz-padding-start: 0px; |
879 } | 888 } |
880 | 889 |
881 #other-language .display | 890 #other-language .display |
882 { | 891 { |
883 -webkit-margin-start: 10px; | 892 -webkit-margin-start: 10px; |
884 -moz-margin-start: 10px; | 893 -moz-margin-start: 10px; |
885 } | 894 } |
OLD | NEW |