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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
212 button.list:hover | 212 button.list:hover |
213 { | 213 { |
214 box-shadow: inset 0 0 0 3px #077CA6; | 214 box-shadow: inset 0 0 0 3px #077CA6; |
215 border-color: #077CA6; | 215 border-color: #077CA6; |
216 } | 216 } |
217 | 217 |
218 .side-controls:not(.wrap) | 218 .side-controls:not(.wrap) |
219 { | 219 { |
220 margin: 0.8rem 0rem; | 220 margin: 0.8rem 0rem; |
221 display: flex; | 221 display: flex; |
222 align-self: center; | |
222 justify-content: flex-end; | 223 justify-content: flex-end; |
223 } | 224 } |
224 | 225 |
225 .side-controls button | 226 .side-controls button |
226 { | 227 { |
227 margin: 0rem; | 228 margin: 0rem; |
228 -moz-margin-start: 1rem; | 229 -moz-margin-start: 1rem; |
229 -webkit-margin-start: 1rem; | 230 -webkit-margin-start: 1rem; |
230 } | 231 } |
231 | 232 |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
537 | 538 |
538 #sidebar, | 539 #sidebar, |
539 #sidebar .fixed, | 540 #sidebar .fixed, |
540 [role="tablist"] | 541 [role="tablist"] |
541 { | 542 { |
542 width: 14.3rem; | 543 width: 14.3rem; |
543 } | 544 } |
544 | 545 |
545 #sidebar | 546 #sidebar |
546 { | 547 { |
547 flex-shrink: 0; | 548 flex-shrink: 0; |
548 } | 549 } |
549 | 550 |
550 #sidebar .fixed | 551 #sidebar .fixed |
551 { | 552 { |
552 top: 1.2rem; | 553 top: 1.2rem; |
553 bottom: 0rem; | 554 bottom: 0rem; |
554 height: auto; | 555 height: auto; |
555 } | 556 } |
556 | 557 |
557 #sidebar header | 558 #sidebar header |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
653 #sidebar .fixed | 654 #sidebar .fixed |
654 { | 655 { |
655 position: fixed; | 656 position: fixed; |
656 } | 657 } |
657 | 658 |
658 #sidebar footer | 659 #sidebar footer |
659 { | 660 { |
660 bottom: 0px; | 661 bottom: 0px; |
661 position: absolute; | 662 position: absolute; |
662 } | 663 } |
664 | |
saroyanm
2018/02/02 16:57:20
Nit: I think this is again an IDE auto-correction.
| |
663 } | 665 } |
664 | 666 |
665 /* | 667 /* |
666 Main content | 668 Main content |
667 */ | 669 */ |
668 | 670 |
669 body[data-tab|="general"] #content-general, | 671 body[data-tab|="general"] #content-general, |
670 body[data-tab|="advanced"] #content-advanced, | 672 body[data-tab|="advanced"] #content-advanced, |
671 body[data-tab|="whitelist"] #content-whitelist, | 673 body[data-tab|="whitelist"] #content-whitelist, |
672 body[data-tab|="help"] #content-help | 674 body[data-tab|="help"] #content-help |
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1127 /* | 1129 /* |
1128 Advanced tab content | 1130 Advanced tab content |
1129 */ | 1131 */ |
1130 | 1132 |
1131 #all-filter-lists-table li.show-message .last-update, | 1133 #all-filter-lists-table li.show-message .last-update, |
1132 #all-filter-lists-table li:not(.show-message) .message, | 1134 #all-filter-lists-table li:not(.show-message) .message, |
1133 #custom-filters:not([data-mode="empty"]) #empty-custom-filters, | 1135 #custom-filters:not([data-mode="empty"]) #empty-custom-filters, |
1134 #custom-filters[data-mode="empty"] #custom-filters-raw, | 1136 #custom-filters[data-mode="empty"] #custom-filters-raw, |
1135 #custom-filters:not([data-mode="write"]) #custom-filters-raw-controls, | 1137 #custom-filters:not([data-mode="write"]) #custom-filters-raw-controls, |
1136 #custom-filters:not([data-mode="read"]) #custom-filters-edit, | 1138 #custom-filters:not([data-mode="read"]) #custom-filters-edit, |
1139 #custom-filters-error, | |
1137 .state span, | 1140 .state span, |
1138 #acceptable-ads:not(.show-dnt-notification) #dnt | 1141 #acceptable-ads:not(.show-dnt-notification) #dnt |
1139 { | 1142 { |
1140 display: none; | 1143 display: none; |
1141 } | 1144 } |
1142 | 1145 |
1143 #all-filter-lists-table button[role="checkbox"][aria-checked="true"] + .state #s tate-active | 1146 #all-filter-lists-table button[role="checkbox"][aria-checked="true"] + .state #s tate-active, |
1144 { | |
1145 display: inline; | |
1146 } | |
1147 | |
1148 #all-filter-lists-table button[role="checkbox"][aria-checked="false"] + .state # state-disabled | 1147 #all-filter-lists-table button[role="checkbox"][aria-checked="false"] + .state # state-disabled |
1149 { | 1148 { |
1150 display: inline; | 1149 display: inline; |
1151 } | 1150 } |
1152 | 1151 |
1153 #all-filter-lists-table | 1152 #all-filter-lists-table |
1154 { | 1153 { |
1155 margin-bottom: 0.8rem; | 1154 margin-bottom: 0.8rem; |
1156 } | 1155 } |
1157 | 1156 |
1157 #custom-filters-edit | |
1158 { | |
1159 white-space: nowrap; | |
1160 } | |
1161 | |
1162 #custom-filters-edit-area | |
1163 { | |
1164 display: flex; | |
1165 width: 100%; | |
1166 } | |
1167 | |
1168 /* | |
1169 avoid doubled margin glitchy behavior | |
1170 as shown in visual specifications | |
1171 */ | |
1172 #custom-filters-edit-area .side-controls .side-controls | |
1173 { | |
1174 margin: 0; | |
1175 } | |
1176 | |
1177 /* | |
1178 visibility: hidden; | |
1179 preserves the flex-box meaning, | |
1180 keeping buttons on the right. | |
1181 */ | |
1182 #custom-filters-edit-error | |
1183 { | |
1184 visibility: hidden; | |
1185 display: flex; | |
1186 align-self: center; | |
1187 justify-content: flex-start; | |
1188 font-weight: bold; | |
1189 } | |
1190 | |
1191 #custom-filters.warning #custom-filters-edit-error, | |
1192 #custom-filters-error | |
1193 { | |
1194 color: #C11D26; | |
1195 padding: 0.2rem 0.8rem; | |
1196 } | |
1197 | |
1198 #custom-filters.warning #custom-filters-edit-error | |
1199 { | |
1200 visibility: visible; | |
1201 } | |
1202 | |
1203 #custom-filters-error | |
1204 { | |
1205 display: block; | |
1206 list-style: none; | |
1207 white-space: pre; | |
1208 overflow: auto; | |
1209 } | |
1210 | |
1211 #custom-filters-error.many | |
1212 { | |
1213 border: 1px solid silver; | |
1214 max-height: 6.2rem; | |
1215 } | |
1216 | |
1158 #custom-filters-raw | 1217 #custom-filters-raw |
1159 { | 1218 { |
1160 width: 100%; | 1219 width: 100%; |
1161 height: 23.6rem; | 1220 height: 23.6rem; |
1162 padding: 0.8rem; | 1221 padding: 0.8rem; |
1163 } | 1222 } |
1164 | 1223 |
1165 #custom-filters-raw:focus | 1224 #custom-filters-raw:focus |
1166 { | 1225 { |
1167 outline: none; | 1226 outline: none; |
1168 border: 2px solid #077CA6; | 1227 border: 2px solid #077CA6; |
1169 } | 1228 } |
1170 | 1229 |
1230 #custom-filters.warning #custom-filters-raw | |
1231 { | |
1232 outline: none; | |
1233 border: 2px solid #C11D26; | |
1234 } | |
1235 | |
1171 #empty-custom-filters | 1236 #empty-custom-filters |
1172 { | 1237 { |
1173 padding: 1.5rem; | 1238 padding: 1.5rem; |
1174 border: 1px solid #CDCDCD; | 1239 border: 1px solid #CDCDCD; |
1175 } | 1240 } |
1176 | 1241 |
1177 /* | 1242 /* |
1178 Context menu | 1243 Context menu |
1179 */ | 1244 */ |
1180 | 1245 |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1339 | 1404 |
1340 #social ul | 1405 #social ul |
1341 { | 1406 { |
1342 list-style: none; | 1407 list-style: none; |
1343 padding: 0px; | 1408 padding: 0px; |
1344 } | 1409 } |
1345 | 1410 |
1346 #social ul li | 1411 #social ul li |
1347 { | 1412 { |
1348 display: inline-block; | 1413 display: inline-block; |
1414 margin-right: 1rem; | |
saroyanm
2018/02/02 16:57:20
Why was this change necessary ?
We already had end
a.giammarchi
2018/02/02 17:22:00
We cannot use margin-end because it's not compatib
saroyanm
2018/02/02 17:58:57
Right, we have created issue #5813 to tackle that.
| |
1349 -moz-margin-end: 1rem; | 1415 -moz-margin-end: 1rem; |
1350 -webkit-margin-end: 1rem; | 1416 -webkit-margin-end: 1rem; |
1351 } | 1417 } |
1352 | 1418 |
1353 #social ul li a | 1419 #social ul li a |
1354 { | 1420 { |
1355 display: block; | 1421 display: block; |
1356 text-align: center; | 1422 text-align: center; |
1357 text-decoration: none; | 1423 text-decoration: none; |
1358 } | 1424 } |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1511 font-size: 1rem; | 1577 font-size: 1rem; |
1512 color: #077CA6; | 1578 color: #077CA6; |
1513 background-color: #E1F2FA; | 1579 background-color: #E1F2FA; |
1514 } | 1580 } |
1515 | 1581 |
1516 #notification strong | 1582 #notification strong |
1517 { | 1583 { |
1518 flex: 1; | 1584 flex: 1; |
1519 text-align: center; | 1585 text-align: center; |
1520 } | 1586 } |
OLD | NEW |