Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: skin/desktop-options.css

Issue 29654555: Issue 6209 - Updated woff fonts and table status column for long texts (Closed)
Left Patch Set: Rebased Created Jan. 29, 2018, 3:01 p.m.
Right Patch Set: Addressed Thomas comments Created Feb. 20, 2018, 3:26 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « mobile-options.html ('k') | skin/fonts.css » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
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);
22 /* local("Ø") forces using no local font called Source Sans Pro */
23 src: local("Ø"), url("fonts/Source-Sans-Pro/300.woff2") format("woff2"),
24 url(fonts/SourceSansPro-Light.woff) format("woff");
25 font-weight: 300;
26 font-style: normal;
27 }
28
29 @font-face
30 {
31 font-family: "Source Sans Pro";
32 src: url(fonts/SourceSansPro-Regular.woff);
33 /* local("Ø") forces using no local font called Source Sans Pro */
34 src: local("Ø"), url("fonts/Source-Sans-Pro/400.woff2") format("woff2"),
35 url(fonts/SourceSansPro-Regular.woff) format("woff");
36 font-style: normal;
37 }
38
39 @font-face
40 {
41 font-family: "Source Sans Pro";
42 src: url(fonts/SourceSansPro-bold.woff);
43 /* local("Ø") forces using no local font called Source Sans Pro */
44 src: local("Ø"), url("fonts/Source-Sans-Pro/700.woff2") format("woff2"),
45 url(fonts/SourceSansPro-bold.woff) format("woff");
46 font-weight: 700;
47 font-style: normal;
48 }
49
50 html 18 html
51 { 19 {
52 font-size: 16px; 20 font-size: 16px;
53 } 21 }
54 22
55 body 23 body
56 { 24 {
57 background-color: #F3F3F3; 25 background-color: #F3F3F3;
58 display: flex; 26 display: flex;
59 justify-content: center; 27 justify-content: center;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 .side-controls:not(.wrap) 189 .side-controls:not(.wrap)
222 { 190 {
223 margin: 0.8rem 0rem; 191 margin: 0.8rem 0rem;
224 display: flex; 192 display: flex;
225 justify-content: flex-end; 193 justify-content: flex-end;
226 } 194 }
227 195
228 .side-controls button 196 .side-controls button
229 { 197 {
230 margin: 0rem; 198 margin: 0rem;
231 -moz-margin-start: 1rem; 199 }
232 -webkit-margin-start: 1rem; 200
201 /*
202 Due to Edge adoption as new target browser
203 we cannot use -moz/webkit-margin-start
204 or -moz/webkit-margin-end because
205 these lack Edge support.
206 Yet we need to preserve html direction
207 and potential UI that might swap right to left.
208 */
209 html:not([dir="rtl"]) .side-controls button
210 {
211 margin-left: 1rem;
212 }
213
214 html[dir="rtl"] .side-controls button
215 {
216 margin-right: 1rem;
233 } 217 }
234 218
235 .side-controls.wrap button 219 .side-controls.wrap button
236 { 220 {
237 margin: 0.6rem 0rem; 221 margin: 0.6rem 0rem;
238 -moz-margin-start: auto; 222 }
239 -webkit-margin-start: auto; 223
224 html:not([dir="rtl"]) .side-controls.wrap button
225 {
226 margin-left: auto;
227 }
228
229 html[dir="rtl"] .side-controls.wrap button
230 {
231 margin-right: auto;
240 } 232 }
241 233
242 /* 234 /*
243 icons 235 icons
244 */ 236 */
245 237
246 .icon 238 .icon
247 { 239 {
248 border: 0px; 240 border: 0px;
249 padding: 0px; 241 padding: 0px;
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 532
541 #sidebar, 533 #sidebar,
542 #sidebar .fixed, 534 #sidebar .fixed,
543 [role="tablist"] 535 [role="tablist"]
544 { 536 {
545 width: 14.3rem; 537 width: 14.3rem;
546 } 538 }
547 539
548 #sidebar 540 #sidebar
549 { 541 {
550 flex-shrink: 0; 542 flex-shrink: 0;
551 } 543 }
552 544
553 #sidebar .fixed 545 #sidebar .fixed
554 { 546 {
555 top: 1.2rem; 547 top: 1.2rem;
556 bottom: 0rem; 548 bottom: 0rem;
557 height: auto; 549 height: auto;
558 } 550 }
559 551
560 #sidebar header 552 #sidebar header
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 padding: 0rem; 603 padding: 0rem;
612 position: relative; 604 position: relative;
613 font-size: 1rem; 605 font-size: 1rem;
614 } 606 }
615 607
616 [role="tablist"] li a 608 [role="tablist"] li a
617 { 609 {
618 display: flex; 610 display: flex;
619 margin-top: -1px; 611 margin-top: -1px;
620 padding: 1rem 0.8rem; 612 padding: 1rem 0.8rem;
621 -moz-margin-end: -1px; 613 margin-left: -1px;
622 -webkit-margin-end: -1px; 614 margin-right: -1px;
623 -moz-margin-start: -1px;
624 -webkit-margin-start: -1px;
625 border-color: #CDCDCD transparent; 615 border-color: #CDCDCD transparent;
626 border-style: solid; 616 border-style: solid;
627 border-width: 1px; 617 border-width: 1px;
628 text-decoration: none; 618 text-decoration: none;
629 color: inherit; 619 color: inherit;
630 cursor: pointer; 620 cursor: pointer;
631 } 621 }
632 622
633 li a[role="tab"][aria-selected] 623 li a[role="tab"][aria-selected]
634 { 624 {
635 -moz-border-start-color: #CDCDCD;
636 -webkit-border-start-color: #CDCDCD;
637 font-weight: 700; 625 font-weight: 700;
638 background-color: #FFF; 626 background-color: #FFF;
627 }
628
629 html:not([dir="rtl"]) li a[role="tab"][aria-selected]
630 {
631 border-left-color: #CDCDCD;
632 }
633
634 html[dir="rtl"] li a[role="tab"][aria-selected]
635 {
636 border-right-color: #CDCDCD;
639 } 637 }
640 638
641 #sidebar footer 639 #sidebar footer
642 { 640 {
643 width: 100%; 641 width: 100%;
644 } 642 }
645 643
646 #sidebar footer p 644 #sidebar footer p
647 { 645 {
648 display: flex; 646 display: flex;
649 justify-content: center; 647 justify-content: center;
650 margin: 1rem 0rem; 648 margin: 1rem 0rem;
651 } 649 }
652 650
653 /* This is a stopgap solution of footer overlapping tabs on low resolutions */ 651 /* This is a stopgap solution of footer overlapping tabs on low resolutions */
654 @media (min-height: 37rem) 652 @media (min-height: 37rem)
655 { 653 {
656 #sidebar .fixed 654 #sidebar .fixed
657 { 655 {
658 position: fixed; 656 position: fixed;
659 } 657 }
660 658
661 #sidebar footer 659 #sidebar footer
662 { 660 {
663 bottom: 0px; 661 bottom: 0px;
664 position: absolute; 662 position: absolute;
665 } 663 }
664
666 } 665 }
667 666
668 /* 667 /*
669 Main content 668 Main content
670 */ 669 */
671 670
672 body[data-tab|="general"] #content-general, 671 body[data-tab|="general"] #content-general,
673 body[data-tab|="advanced"] #content-advanced, 672 body[data-tab|="advanced"] #content-advanced,
674 body[data-tab|="whitelist"] #content-whitelist, 673 body[data-tab|="whitelist"] #content-whitelist,
675 body[data-tab|="help"] #content-help 674 body[data-tab|="help"] #content-help
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 } 730 }
732 731
733 section.cols 732 section.cols
734 { 733 {
735 display: flex; 734 display: flex;
736 } 735 }
737 736
738 section.cols > *:first-child 737 section.cols > *:first-child
739 { 738 {
740 flex: 1; 739 flex: 1;
741 -moz-margin-end: 2rem; 740 }
742 -webkit-margin-end: 2rem; 741
742 html:not([dir="rtl"]) section.cols > *:first-child
743 {
744 margin-right: 2rem;
745 }
746
747 html[dir="rtl"] section.cols > *:first-child
748 {
749 margin-left: 2rem;
743 } 750 }
744 751
745 section.cols > *:last-child 752 section.cols > *:last-child
746 { 753 {
747 flex: 3; 754 flex: 3;
748 } 755 }
749 756
750 /* 757 /*
751 Acceptable ads 758 Acceptable ads
752 */ 759 */
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 html[dir="rtl"] button 814 html[dir="rtl"] button
808 { 815 {
809 left: auto; 816 left: auto;
810 right: 0rem; 817 right: 0rem;
811 } 818 }
812 819
813 #acceptable-ads label 820 #acceptable-ads label
814 { 821 {
815 font-weight: 700; 822 font-weight: 700;
816 font-size: 1rem; 823 font-size: 1rem;
817 -moz-margin-end: 0.5rem; 824 }
818 -webkit-margin-end: 0.5rem; 825
826 html:not([dir="rtl"]) #acceptable-ads label
827 {
828 margin-right: 0.5rem;
829 }
830
831 html[dir="rtl"] #acceptable-ads label
832 {
833 margin-left: 0.5rem;
819 } 834 }
820 835
821 #dnt 836 #dnt
822 { 837 {
823 padding: 0.8rem; 838 padding: 0.8rem;
824 border: 1px solid #077CA6; 839 border: 1px solid #077CA6;
825 } 840 }
826 841
827 .new 842 .new
828 { 843 {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 .th .col5:nth-of-type(4), 989 .th .col5:nth-of-type(4),
975 .table .col5:nth-of-type(4) 990 .table .col5:nth-of-type(4)
976 { 991 {
977 flex: 1; 992 flex: 1;
978 } 993 }
979 994
980 .th .col5:nth-of-type(5), 995 .th .col5:nth-of-type(5),
981 .table .col5:nth-of-type(5) 996 .table .col5:nth-of-type(5)
982 { 997 {
983 flex: 1; 998 flex: 1;
984 -moz-margin-start: 0; 999 }
985 -webkit-margin-start: 0; 1000
986 -moz-margin-end: 1.8rem; 1001 html:not([dir="rtl"]) .th .col5:nth-of-type(5),
987 -webkit-margin-end: 1.8rem; 1002 html:not([dir="rtl"]) .table .col5:nth-of-type(5)
1003 {
1004 margin-left: 0;
1005 margin-right: 1.8rem;
1006 }
1007
1008 html[dir="rtl"] .th .col5:nth-of-type(5),
1009 html[dir="rtl"] .table .col5:nth-of-type(5)
1010 {
1011 margin-right: 0;
1012 margin-left: 1.8rem;
988 } 1013 }
989 1014
990 .table.cols > span 1015 .table.cols > span
991 { 1016 {
992 margin: 0rem; 1017 margin: 0rem;
993 } 1018 }
994 1019
995 .table.cols li 1020 .table.cols li
996 { 1021 {
997 padding: 0.5rem 0rem; 1022 padding: 0.5rem 0rem;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 } 1075 }
1051 1076
1052 /* 1077 /*
1053 Tooltips 1078 Tooltips
1054 */ 1079 */
1055 1080
1056 .tooltip 1081 .tooltip
1057 { 1082 {
1058 position: relative; 1083 position: relative;
1059 margin: 0rem; 1084 margin: 0rem;
1060 -moz-margin-end: 1rem;
1061 -webkit-margin-end: 1rem;
1062 line-height: 1.5rem; 1085 line-height: 1.5rem;
1063 text-decoration: none; 1086 text-decoration: none;
1064 cursor: help; 1087 cursor: help;
1088 }
1089
1090 html:not([dir="rtl"]) .tooltip
1091 {
1092 margin-right: 1rem;
1093 }
1094
1095 html[dir="rtl"] .tooltip
1096 {
1097 margin-left: 1rem;
1065 } 1098 }
1066 1099
1067 /* 1100 /*
1068 Used for translatable screen reader only content. 1101 Used for translatable screen reader only content.
1069 e.g.: Use instead of aria-label to avoid complex attribute value translation 1102 e.g.: Use instead of aria-label to avoid complex attribute value translation
1070 */ 1103 */
1071 .sr-only 1104 .sr-only
1072 { 1105 {
1073 position: absolute; 1106 position: absolute;
1074 overflow: hidden; 1107 overflow: hidden;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 1141
1109 #content-whitelist form input 1142 #content-whitelist form input
1110 { 1143 {
1111 flex: 1; 1144 flex: 1;
1112 height: 100%; 1145 height: 100%;
1113 padding: 0.5rem 1rem; 1146 padding: 0.5rem 1rem;
1114 font-size: 1rem; 1147 font-size: 1rem;
1115 border: 2px solid #077CA6; 1148 border: 2px solid #077CA6;
1116 } 1149 }
1117 1150
1118 #content-whitelist form button 1151 html:not([dir="rtl"]) #content-whitelist form button
1119 { 1152 {
1120 -moz-margin-start: 0.7rem; 1153 margin-left: 0.7rem;
1121 -webkit-margin-start: 0.7rem; 1154 }
1155
1156 html[dir="rtl"] #content-whitelist form button
1157 {
1158 margin-right: 0.7rem;
1122 } 1159 }
1123 1160
1124 #whitelisting-table li 1161 #whitelisting-table li
1125 { 1162 {
1126 padding-left: 1.4rem; 1163 padding-left: 1.4rem;
1127 padding-right: 1.4rem; 1164 padding-right: 1.4rem;
1128 border-left: 0rem; 1165 border-left: 0rem;
1129 border-right: 0rem; 1166 border-right: 0rem;
1130 } 1167 }
1131 1168
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 1381
1345 #social ul 1382 #social ul
1346 { 1383 {
1347 list-style: none; 1384 list-style: none;
1348 padding: 0px; 1385 padding: 0px;
1349 } 1386 }
1350 1387
1351 #social ul li 1388 #social ul li
1352 { 1389 {
1353 display: inline-block; 1390 display: inline-block;
1354 -moz-margin-end: 1rem; 1391 }
1355 -webkit-margin-end: 1rem; 1392
1393 html:not([dir="rtl"]) #social ul li
1394 {
1395 margin-right: 1rem;
1396 }
1397
1398 html[dir="rtl"] #social ul li
1399 {
1400 margin-left: 1rem;
1356 } 1401 }
1357 1402
1358 #social ul li a 1403 #social ul li a
1359 { 1404 {
1360 display: block; 1405 display: block;
1361 text-align: center; 1406 text-align: center;
1362 text-decoration: none; 1407 text-decoration: none;
1363 } 1408 }
1364 1409
1365 /* 1410 /*
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 font-size: 1rem; 1561 font-size: 1rem;
1517 color: #077CA6; 1562 color: #077CA6;
1518 background-color: #E1F2FA; 1563 background-color: #E1F2FA;
1519 } 1564 }
1520 1565
1521 #notification strong 1566 #notification strong
1522 { 1567 {
1523 flex: 1; 1568 flex: 1;
1524 text-align: center; 1569 text-align: center;
1525 } 1570 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld