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

Delta Between Two Patch Sets: skin/options.css

Issue 29321198: Issue 2376 - Implement custom filters in new options page (Closed)
Left Patch Set: Addressed comments, moved error message to background page for consistency Created July 9, 2015, 4:25 p.m.
Right Patch Set: Nit fixes Created July 15, 2015, 2:35 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 | « options.js ('k') | no next file » | 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-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);
22 /* local("Ø") forces using no local font called Source Sans Pro */
23 src: local("Ø"), url(fonts/SourceSansPro-Light.woff) format("woff");
24 font-weight: 300;
25 font-style: normal;
26 }
27
28 @font-face
29 {
30 font-family: "Source Sans Pro";
31 src: url(fonts/SourceSansPro-Regular.woff);
32 /* local("Ø") forces using no local font called Source Sans Pro */
33 src: local("Ø"), url(fonts/SourceSansPro-Regular.woff) format("woff");
34 font-weight: 400;
35 font-style: normal;
36 }
37
38 @font-face
39 {
40 font-family: "Source Sans Pro";
41 src: url(fonts/SourceSansPro-Semibold.woff);
42 /* local("Ø") forces using no local font called Source Sans Pro */
43 src: local("Ø"), url(fonts/SourceSansPro-Semibold.woff) format("woff");
44 font-weight: 600;
45 font-style: normal;
46 }
47
18 body 48 body
19 { 49 {
20 background-color: #F5F5F5; 50 background-color: #F5F5F5;
21 display: flex; 51 display: flex;
52 margin: 20px 10px;
22 font-family: "Source Sans Pro", sans-serif; 53 font-family: "Source Sans Pro", sans-serif;
23 font-size: 14px; 54 font-size: 14px;
24 white-space: nowrap;
25 } 55 }
26 56
27 h1 57 h1
28 { 58 {
29 font-size: 24px; 59 font-size: 24px;
30 font-weight: 100; 60 line-height: 1em;
61 font-weight: 300;
31 } 62 }
32 63
33 h2 64 h2
34 { 65 {
35 font-size: 16px; 66 font-size: 16px;
36 font-weight: 500; 67 font-weight: 600;
37 } 68 }
38 69
39 p 70 p
40 { 71 {
41 font-weight: 100; 72 font-weight: 300;
42 } 73 }
43 74
44 hr 75 hr
45 { 76 {
46 background-color: #CDCDCD; 77 background-color: #CDCDCD;
47 border: 0px; 78 border: 0px;
48 height: 1px; 79 height: 1px;
49 margin: 0px; 80 margin: 0px;
50 } 81 }
51 82
(...skipping 15 matching lines...) Expand all
67 } 98 }
68 99
69 .option-name > * 100 .option-name > *
70 { 101 {
71 -moz-margin-end: 6px; 102 -moz-margin-end: 6px;
72 -webkit-margin-end: 6px; 103 -webkit-margin-end: 6px;
73 } 104 }
74 105
75 #nav-sidebar 106 #nav-sidebar
76 { 107 {
77 position: relative;
78 padding: 0px 0px 16px 0px;
79 -moz-padding-start: 10px;
80 -webkit-padding-start: 10px;
81 min-width: 198px; 108 min-width: 198px;
82 } 109 }
83 110
84 #nav-sidebar .fixed 111 #nav-sidebar .fixed
85 { 112 {
86 height: 100%; 113 top: 40px;
114 bottom: 2px;
115 height: auto;
87 position: fixed; 116 position: fixed;
88 } 117 }
89 118
90 #page-title 119 #page-title
91 { 120 {
92 -webkit-margin-start: 10px; 121 padding: 0px 20px;
93 -moz-margin-start: 10px;
94 } 122 }
95 123
96 #page-title p 124 #page-title p
97 { 125 {
98 margin: 0px; 126 margin: 0px;
99 padding: 40px 0px 0px 0px;
100 font-size: 16px; 127 font-size: 16px;
128 line-height: 1em;
101 } 129 }
102 130
103 #page-title h1 131 #page-title h1
104 { 132 {
105 margin: 0px; 133 margin: 0px;
106 padding: 8px 0px 16px 0px; 134 padding: 8px 0px 16px 0px;
107 } 135 }
108 136
109 .flex-container 137 .flex-container
110 { 138 {
111 display: flex; 139 display: flex;
112 flex-flow: row wrap; 140 flex-flow: row wrap;
113 } 141 }
114 142
115 .tabs li 143 .tabs li
116 { 144 {
117 cursor: pointer; 145 cursor: pointer;
118 display: flex; 146 display: flex;
119 } 147 }
120 148
121 .tabs li a:first-child 149 .tabs li a
122 { 150 {
123 flex: 1; 151 flex: 1;
124 color: inherit; 152 color: inherit;
125 text-decoration: none; 153 text-decoration: none;
126 } 154 }
127 155
128 .tabs.vertical 156 .tabs.vertical
129 { 157 {
130 list-style: none; 158 list-style: none;
131 margin: 0px; 159 margin: 0px;
132 position: relative; 160 position: relative;
133 padding: 0px; 161 padding: 0px;
134 width: 198px; 162 width: 198px;
135 } 163 }
136 164
137 .tabs.vertical li 165 .tabs.vertical li
138 { 166 {
139 border-color: #CDCDCD; 167 border-color: #CDCDCD transparent;
140 border-style: solid; 168 border-style: solid;
141 border-width: 1px 0px 0px 0px; 169 border-width: 1px;
142 font-size: 16px; 170 font-size: 16px;
143 font-weight: 100; 171 font-weight: 300;
144 padding: 16px 0px; 172 line-height: 1em;
145 -moz-padding-end: 20px; 173 margin-top: -1px;
146 -webkit-padding-end: 20px; 174 padding: 14px 20px;
147 -moz-padding-start: 11px;
148 -webkit-padding-start: 11px;
149 }
150
151 body[data-tab="general"] #tab-general + li,
152 body[data-tab="advanced"] #tab-advanced + li,
153 body[data-tab="help"] #tab-help + li
154 {
155 border-width: 0px;
156 }
157
158 #tab-help,
159 body[data-tab="advanced"] #tab-advanced + li
160 {
161 border-bottom-width: 1px;
162 } 175 }
163 176
164 body[data-tab="general"] #tab-general, 177 body[data-tab="general"] #tab-general,
165 body[data-tab="advanced"] #tab-advanced, 178 body[data-tab="advanced"] #tab-advanced,
166 body[data-tab="help"] #tab-help 179 body[data-tab="help"] #tab-help
167 { 180 {
168 background-color: #FFFFFF; 181 background-color: #FFFFFF;
169 border-radius: 3px 0px 0px 3px; 182 border-radius: 3px 0px 0px 3px;
170 border-width: 1px; 183 border-width: 1px;
171 -moz-border-end: 0px; 184 font-weight: 600;
172 -webkit-border-end: 0px; 185 -moz-border-start-color: #CDCDCD;
173 font-weight: 900; 186 -webkit-border-start-color: #CDCDCD;
174 -moz-margin-end: -1px; 187 -moz-margin-end: -1px;
175 -webkit-margin-end: -1px; 188 -webkit-margin-end: -1px;
176 -moz-padding-start: 10px; 189 -moz-margin-start: -1px;
177 -webkit-padding-start: 10px; 190 -webkit-margin-start: -1px;
178 position: relative; 191 -moz-padding-end: 21px;
192 -webkit-padding-end: 21px;
193 -moz-padding-start: 21px;
194 -webkit-padding-start: 21px;
195 }
196
197 html[dir="rtl"] body[data-tab="general"] #tab-general,
198 html[dir="rtl"] body[data-tab="advanced"] #tab-advanced,
199 html[dir="rtl"] body[data-tab="help"] #tab-help
200 {
201 border-radius: 0px 3px 3px 0px;
179 } 202 }
180 203
181 .tabs.vertical.bottom 204 .tabs.vertical.bottom
182 { 205 {
183 bottom: 0px; 206 bottom: 0px;
184 position: absolute; 207 position: absolute;
185 } 208 }
186 209
187 .tabs.vertical.bottom li:first-child 210 .tabs.vertical.bottom li:first-child
188 { 211 {
189 border-top: 0px; 212 border-top: 0px;
190 } 213 }
191 214
192 .tabs.vertical .icon 215 #tab-contribute
193 { 216 {
194 margin: 2px 0px 0px 0px; 217 border-bottom: none;
218 }
219
220 #nav-sidebar ul li .icon
221 {
222 height: 14px;
223 width: 14px;
195 } 224 }
196 225
197 #tab-general .icon 226 #tab-general .icon
198 { 227 {
199 background-position: -15px -17px; 228 background-position: -16px -18px;
200 height: 16px;
201 width: 16px;
202 } 229 }
203 230
204 #tab-advanced .icon 231 #tab-advanced .icon
205 { 232 {
206 background-position: -45px -18px; 233 background-position: -46px -18px;
207 height: 16px;
208 width: 16px;
209 } 234 }
210 235
211 #tab-help .icon 236 #tab-help .icon
212 { 237 {
213 background-position: 0px -17px; 238 background-position: -1px -18px;
214 height: 16px;
215 width: 16px;
216 } 239 }
217 240
218 #tab-share .icon 241 #tab-share .icon
219 { 242 {
220 background-position: -60px -17px; 243 background-position: -61px -18px;
221 height: 16px;
222 width: 16px;
223 } 244 }
224 245
225 #tab-contribute .icon 246 #tab-contribute .icon
226 { 247 {
227 background-position: -30px -17px; 248 background-position: -31px -18px;
228 height: 16px;
229 width: 16px;
230 } 249 }
231 250
232 #tab-content 251 #tab-content
233 { 252 {
234 background-color: #FFFFFF; 253 background-color: #FFFFFF;
235 border: 1px solid #CDCDCD; 254 border: 1px solid #CDCDCD;
236 border-radius: 8px; 255 border-radius: 8px;
237 padding: 0px 60px 40px 60px; 256 padding: 0px 60px 40px 60px;
238 width: 960px; 257 width: 960px;
239 } 258 }
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 -moz-padding-end: 10px; 969 -moz-padding-end: 10px;
951 -webkit-padding-start: 0px; 970 -webkit-padding-start: 0px;
952 -moz-padding-start: 0px; 971 -moz-padding-start: 0px;
953 } 972 }
954 973
955 #other-language .display 974 #other-language .display
956 { 975 {
957 -webkit-margin-start: 10px; 976 -webkit-margin-start: 10px;
958 -moz-margin-start: 10px; 977 -moz-margin-start: 10px;
959 } 978 }
LEFTRIGHT
« options.js ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld