Skip to content

Commit f817b76

Browse files
Michael ScottoMichael Scotto
Michael Scotto
authored and
Michael Scotto
committed
collect static
1 parent c48ed25 commit f817b76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+12474
-2228
lines changed

‎front_end/collect_static/admin/css/base.css

+336-219
Large diffs are not rendered by default.

‎front_end/collect_static/admin/css/changelists.css

+130-82
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@
1212
.change-list .hiddenfields { display:none; }
1313

1414
.change-list .filtered table {
15-
border-right: 1px solid #ddd;
15+
border-right: none;
1616
}
1717

1818
.change-list .filtered {
1919
min-height: 400px;
2020
}
2121

22-
.change-list .filtered {
23-
background: white url(../img/changelist-bg.gif) top right repeat-y !important;
24-
}
25-
26-
.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
27-
margin-right: 160px !important;
28-
width: auto !important;
22+
.change-list .filtered .results, .change-list .filtered .paginator,
23+
.filtered #toolbar, .filtered div.xfull {
24+
margin-right: 280px;
25+
width: auto;
2926
}
3027

3128
.change-list .filtered table tbody th {
@@ -37,21 +34,16 @@
3734
}
3835

3936
#changelist .toplinks {
40-
border-bottom: 1px solid #ccc !important;
37+
border-bottom: 1px solid #ddd;
4138
}
4239

4340
#changelist .paginator {
4441
color: #666;
45-
border-top: 1px solid #eee;
4642
border-bottom: 1px solid #eee;
47-
background: white url(../img/nav-bg.gif) 0 180% repeat-x;
43+
background: #fff;
4844
overflow: hidden;
4945
}
5046

51-
.change-list .filtered .paginator {
52-
border-right: 1px solid #ddd;
53-
}
54-
5547
/* CHANGELIST TABLES */
5648

5749
#changelist table thead th {
@@ -65,17 +57,8 @@
6557
text-align: center;
6658
}
6759

68-
#changelist table tbody td, #changelist table tbody th {
69-
border-left: 1px solid #ddd;
70-
}
71-
72-
#changelist table tbody td:first-child, #changelist table tbody th:first-child {
73-
border-left: 0;
74-
border-right: 1px solid #ddd;
75-
}
76-
7760
#changelist table tbody td.action-checkbox {
78-
text-align:center;
61+
text-align: center;
7962
}
8063

8164
#changelist table tfoot {
@@ -85,23 +68,53 @@
8568
/* TOOLBAR */
8669

8770
#changelist #toolbar {
88-
padding: 3px;
89-
border-bottom: 1px solid #ddd;
90-
background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
71+
padding: 8px 10px;
72+
margin-bottom: 15px;
73+
border-top: 1px solid #eee;
74+
border-bottom: 1px solid #eee;
75+
background: #f8f8f8;
9176
color: #666;
9277
}
9378

9479
#changelist #toolbar form input {
95-
font-size: 11px;
96-
padding: 1px 2px;
80+
border-radius: 4px;
81+
font-size: 14px;
82+
padding: 5px;
83+
color: #333;
9784
}
9885

9986
#changelist #toolbar form #searchbar {
100-
padding: 2px;
87+
height: 19px;
88+
border: 1px solid #ccc;
89+
padding: 2px 5px;
90+
margin: 0;
91+
vertical-align: top;
92+
font-size: 13px;
93+
}
94+
95+
#changelist #toolbar form #searchbar:focus {
96+
border-color: #999;
97+
}
98+
99+
#changelist #toolbar form input[type="submit"] {
100+
border: 1px solid #ccc;
101+
padding: 2px 10px;
102+
margin: 0;
103+
vertical-align: middle;
104+
background: #fff;
105+
box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
106+
cursor: pointer;
107+
color: #333;
108+
}
109+
110+
#changelist #toolbar form input[type="submit"]:focus,
111+
#changelist #toolbar form input[type="submit"]:hover {
112+
border-color: #999;
101113
}
102114

103115
#changelist #changelist-search img {
104116
vertical-align: middle;
117+
margin-right: 4px;
105118
}
106119

107120
/* FILTER COLUMN */
@@ -111,26 +124,37 @@
111124
top: 0;
112125
right: 0;
113126
z-index: 1000;
114-
width: 160px;
115-
border-left: 1px solid #ddd;
116-
background: #efefef;
127+
width: 240px;
128+
background: #f8f8f8;
129+
border-left: none;
117130
margin: 0;
118131
}
119132

120133
#changelist-filter h2 {
121-
font-size: 11px;
122-
padding: 2px 5px;
123-
border-bottom: 1px solid #ddd;
134+
font-size: 14px;
135+
text-transform: uppercase;
136+
letter-spacing: 0.5px;
137+
padding: 5px 15px;
138+
margin-bottom: 12px;
139+
border-bottom: none;
124140
}
125141

126142
#changelist-filter h3 {
127-
font-size: 12px;
128-
margin-bottom: 0;
143+
font-weight: 400;
144+
font-size: 14px;
145+
padding: 0 15px;
146+
margin-bottom: 10px;
129147
}
130148

131149
#changelist-filter ul {
132-
padding-left: 0;
133-
margin-left: 10px;
150+
margin: 5px 0;
151+
padding: 0 15px 15px;
152+
border-bottom: 1px solid #eaeaea;
153+
}
154+
155+
#changelist-filter ul:last-child {
156+
border-bottom: none;
157+
padding-bottom: none;
134158
}
135159

136160
#changelist-filter li {
@@ -140,32 +164,33 @@
140164
}
141165

142166
#changelist-filter a {
167+
display: block;
143168
color: #999;
144169
}
145170

146-
#changelist-filter a:hover {
147-
color: #036;
148-
}
149-
150171
#changelist-filter li.selected {
151-
border-left: 5px solid #ccc;
152-
padding-left: 5px;
153-
margin-left: -10px;
172+
border-left: 5px solid #eaeaea;
173+
padding-left: 10px;
174+
margin-left: -15px;
154175
}
155176

156177
#changelist-filter li.selected a {
157-
color: #5b80b2 !important;
178+
color: #5b80b2;
179+
}
180+
181+
#changelist-filter a:focus, #changelist-filter a:hover,
182+
#changelist-filter li.selected a:focus,
183+
#changelist-filter li.selected a:hover {
184+
color: #036;
158185
}
159186

160187
/* DATE DRILLDOWN */
161188

162189
.change-list ul.toplinks {
163190
display: block;
164-
background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
165-
border-top: 1px solid white;
166191
float: left;
167-
padding: 0 !important;
168-
margin: 0 !important;
192+
padding: 0;
193+
margin: 0;
169194
width: 100%;
170195
}
171196

@@ -180,14 +205,15 @@
180205
color: #999;
181206
}
182207

208+
.change-list ul.toplinks .date-back a:focus,
183209
.change-list ul.toplinks .date-back a:hover {
184210
color: #036;
185211
}
186212

187213
/* PAGINATOR */
188214

189215
.paginator {
190-
font-size: 11px;
216+
font-size: 13px;
191217
padding-top: 10px;
192218
padding-bottom: 10px;
193219
line-height: 22px;
@@ -197,23 +223,24 @@
197223

198224
.paginator a:link, .paginator a:visited {
199225
padding: 2px 6px;
200-
border: solid 1px #ccc;
201-
background: white;
226+
background: #79aec8;
202227
text-decoration: none;
228+
color: #fff;
203229
}
204230

205231
.paginator a.showall {
206-
padding: 0 !important;
207-
border: none !important;
232+
padding: 0;
233+
border: none;
234+
background: none;
235+
color: #5b80b2;
208236
}
209237

210-
.paginator a.showall:hover {
211-
color: #036 !important;
212-
background: transparent !important;
238+
.paginator a.showall:focus, .paginator a.showall:hover {
239+
background: none;
240+
color: #036;
213241
}
214242

215243
.paginator .end {
216-
border-width: 2px !important;
217244
margin-right: 6px;
218245
}
219246

@@ -224,33 +251,34 @@
224251
vertical-align: top;
225252
}
226253

227-
.paginator a:hover {
254+
.paginator a:focus, .paginator a:hover {
228255
color: white;
229-
background: #5b80b2;
230-
border-color: #036;
256+
background: #036;
231257
}
232258

233259
/* ACTIONS */
234260

235261
.filtered .actions {
236-
margin-right: 160px !important;
237-
border-right: 1px solid #ddd;
262+
margin-right: 280px;
263+
border-right: none;
238264
}
239265

240266
#changelist table input {
241267
margin: 0;
268+
vertical-align: baseline;
242269
}
243270

244271
#changelist table tbody tr.selected {
245272
background-color: #FFFFCC;
246273
}
247274

248275
#changelist .actions {
276+
padding: 10px;
277+
background: #fff;
278+
border-top: none;
279+
border-bottom: none;
280+
line-height: 24px;
249281
color: #999;
250-
padding: 3px;
251-
border-top: 1px solid #fff;
252-
border-bottom: 1px solid #ddd;
253-
background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
254282
}
255283

256284
#changelist .actions.selected {
@@ -263,7 +291,7 @@
263291
#changelist .actions span.action-counter,
264292
#changelist .actions span.clear,
265293
#changelist .actions span.question {
266-
font-size: 11px;
294+
font-size: 13px;
267295
margin: 0 0.5em;
268296
display: none;
269297
}
@@ -273,21 +301,41 @@
273301
}
274302

275303
#changelist .actions select {
276-
border: 1px solid #aaa;
277-
margin-left: 0.5em;
278-
padding: 1px 2px;
304+
vertical-align: top;
305+
height: 24px;
306+
background: none;
307+
border: 1px solid #ccc;
308+
border-radius: 4px;
309+
font-size: 14px;
310+
padding: 0 0 0 4px;
311+
margin: 0;
312+
margin-left: 10px;
279313
}
280314

281-
#changelist .actions label {
282-
font-size: 11px;
283-
margin-left: 0.5em;
315+
#changelist .actions select:focus {
316+
border-color: #999;
284317
}
285318

286-
#changelist #action-toggle {
287-
display: none;
319+
#changelist .actions label {
320+
display: inline-block;
321+
vertical-align: middle;
322+
font-size: 13px;
288323
}
289324

290325
#changelist .actions .button {
291-
font-size: 11px;
292-
padding: 1px 2px;
326+
font-size: 13px;
327+
border: 1px solid #ccc;
328+
border-radius: 4px;
329+
background: #fff;
330+
box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
331+
cursor: pointer;
332+
height: 24px;
333+
line-height: 1;
334+
padding: 4px 8px;
335+
margin: 0;
336+
color: #333;
337+
}
338+
339+
#changelist .actions .button:focus, #changelist .actions .button:hover {
340+
border-color: #999;
293341
}

‎front_end/collect_static/admin/css/fonts.css

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@font-face {
2+
font-family: 'Roboto';
3+
src: url('../fonts/Roboto-Bold-webfont.woff');
4+
font-weight: 700;
5+
font-style: normal;
6+
}
7+
8+
@font-face {
9+
font-family: 'Roboto';
10+
src: url('../fonts/Roboto-Regular-webfont.woff');
11+
font-weight: 400;
12+
font-style: normal;
13+
}
14+
15+
@font-face {
16+
font-family: 'Roboto';
17+
src: url('../fonts/Roboto-Light-webfont.woff');
18+
font-weight: 300;
19+
font-style: normal;
20+
}

0 commit comments

Comments
 (0)