Skip to content

Commit 87eafdd

Browse files
andrewgodwinandrewgodwin
committed
Correct responsiveness.
1 parent 5b76613 commit 87eafdd

File tree

2 files changed

+58
-246
lines changed

2 files changed

+58
-246
lines changed

Diff for: ‎static/css/style.css

+12-198
Original file line numberDiff line numberDiff line change
@@ -417,76 +417,26 @@ table.nice {
417417

418418
@media (max-width: 1150px) {
419419

420-
.header,
421-
.section {
422-
width: 750px;
423-
}
424-
425-
.primary-nav .home {
426-
display: none;
427-
}
428-
429-
.section-page .article-main {
430-
width: 740px;
431-
font-size: 90%;
432-
}
433-
.section-page .article-main img {
434-
left: -175px;
435-
}
436-
.section-page .article-main h2 {
437-
font-size: 230%;
438-
}
439-
.section-page .article-main .pre-title,
440-
.section-page .article-main h2,
441-
.section-page .article-main p,
442-
.section-page .article-main .meta {
443-
margin-left: 390px;
420+
.section {
421+
width: 750px;
444422
}
445423

446-
.section-page .article-secondary {
447-
width: 350px;
448-
font-size: 90%;
449-
}
450-
.section-page .article-secondary h2 {
451-
font-size: 190%;
424+
.primary-nav {
425+
width: 750px;
452426
}
453427

454-
.section-page .article-tertiary {
455-
width: 230px;
456-
}
457-
.section-page .article-tertiary {
458-
margin-right: 30px;
459-
}
460-
.section-page .article-tertiary:nth-child(4n) {
461-
margin-right: 30px;
462-
}
463-
.section-page .article-tertiary:nth-child(4n+1) {
464-
clear: none;
465-
}
466-
.section-page .article-tertiary:nth-child(3n) {
467-
margin-right: 0;
428+
.main-column {
429+
width: 750px;
468430
}
469-
.section-page .article-tertiary:nth-child(3n+1) {
431+
432+
.secondary-column {
470433
clear: left;
471434
}
472435

473-
.header-image {
474-
width: 750px;
475-
border-top: 4px solid #0084c8;
476-
}
477-
478-
.body-text .image-left,
479-
.body-text .image-right {
480-
width: 250px;
481-
font-size: 90%;
482-
}
483-
484-
.main-column {
485-
width: 750px;
486-
}
436+
h1 {
437+
clear: both;
438+
}
487439

488-
.secondary-column {
489-
clear: left;
490440
}
491441

492442

@@ -502,156 +452,20 @@ table.nice {
502452
width: 100%;
503453
}
504454

505-
.header,
455+
.primary-nav,
506456
.section {
507457
width: 90%;
508458
margin-left: 5%;
509459
margin-right: 5%;
510460
}
511461

512-
.header,
513-
.has-edit-bar .header,
514-
.article-page .header {
515-
margin-top: 10px;
516-
}
517-
518-
.header .logo {
519-
float: none;
520-
width: 145px;
521-
margin: 0px auto 5px auto;
522-
}
523-
.header .logo img {
524-
width: 145px;
525-
}
526-
527-
.primary-nav {
528-
float: none;
529-
padding: 4px 0;
530-
margin: 0 0 8px 0;
531-
line-height: 25px;
532-
text-align: center;
533-
}
534-
.primary-nav li {
535-
float: none;
536-
display: inline;
537-
white-space: nowrap;
538-
}
539-
.primary-nav li a {
540-
float: none;
541-
display: inline;
542-
border-bottom: 0;
543-
white-space: nowrap;
544-
}
545-
.primary-nav li a:hover,
546-
.primary-nav li.selected a {
547-
border-bottom: 0;
548-
}
549-
550-
.header-image {
551-
margin-top: 10px;
552-
}
553-
554-
.edit-bar {
555-
display: none;
556-
}
557-
558-
.not-mobile {
559-
display: none !important;
560-
}
561-
562-
.top-article {
563-
margin-top: 10px;
564-
}
565-
566-
.section-page .article-main {
567-
width: 100%;
568-
border-left: 0;
569-
border-top: 5px solid #0084c8;
570-
float: none;
571-
margin: 0 0 20px 0;
572-
}
573-
.section-page .article-main img {
574-
position: inherit;
575-
left: 0;
576-
float: none;
577-
width: 100%;
578-
}
579-
.section-page .article-main .pre-title,
580-
.section-page .article-main h2,
581-
.section-page .article-main p,
582-
.section-page .article-main .meta {
583-
margin-left: 10px;
584-
}
585-
586-
.section-page .article-secondary {
587-
width: 100%;
588-
font-size: 90%;
589-
border-top: 5px solid #0084c8;
590-
}
591-
592-
.section-page .article-tertiary {
593-
width: 100%;
594-
}
595-
596462
h1 {
597463
font-size: 180%;
598464
margin: 10px 0 20px 0;
599465
}
600466

601-
h1 .header-secondary {
602-
float: none;
603-
width: auto;
604-
text-align: left;
605-
font-size: 70%;
606-
margin-left: 0;
607-
}
608-
609467
h2 {
610468
font-size: 150%;
611469
}
612470

613-
.article-page h1 {
614-
font-size: 35px;
615-
margin-bottom: 15px;
616-
}
617-
618-
.article-page .header-secondary .score-stars {
619-
font-size: 80%;
620-
left: 0;
621-
}
622-
623-
.body-text .image-left,
624-
.body-text .image-right {
625-
width: 300px;
626-
float: none;
627-
font-size: 90%;
628-
margin-left: auto;
629-
margin-right: auto;
630-
}
631-
632-
.read-more a {
633-
display: block;
634-
}
635-
636-
table.articles td {
637-
display: block;
638-
}
639-
table.articles td.article-image {
640-
float: left;
641-
}
642-
table.articles td.article-title-and-lead {
643-
margin-left: 45px;
644-
padding-bottom: 5px;
645-
}
646-
table.articles td.published {
647-
font-size: 90%;
648-
padding-bottom: 35px;
649-
}
650-
table.articles td.published .date,
651-
table.articles td.published .author {
652-
display: inline;
653-
}
654-
table.articles td.published .author {
655-
margin-left: 0.6em;
656-
}
657471
}

Diff for: ‎templates/program-applicants.html

+46-48
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,54 @@
44

55
{% block content %}
66
<div class="section">
7-
<div class="main-column">
8-
<h1>Applicants</h1>
7+
<h1>Applicants</h1>
98

10-
<table class="nice">
11-
<tr>
12-
<th>Name</th>
13-
<th>Applied</th>
14-
<th>Score</th>
15-
<th>Allocated</th>
16-
<th></th>
17-
</tr>
18-
{% for applicant in applicants %}
19-
<tr>
20-
<td>{{ applicant.name }}</td>
21-
<td class="small">{{ applicant.applied|date:"j M Y P" }}</td>
22-
{% if applicant.has_scored %}
23-
<td>
24-
{{ applicant.average_score|floatformat:"1"|default:"-" }}
25-
<span class="num_votes">({{ applicant.scores.count }} vote{{ applicant.scores.count|pluralize }})</span>
26-
</td>
27-
<td class="{% if not applicant.allocations.exists %}empty{% endif %}">
28-
{% for allocation in applicant.allocations.all %}
29-
<i class="fa fa-{{ allocation.resource.fa_icon }}"></i> {{ allocation.amount }}&nbsp;
30-
{% empty %}
31-
(none)
32-
{% endfor %}
33-
</td>
34-
<td>
35-
<a href="{{ applicant.urls.view }}" class="button boring">View</a>
36-
<a href="{{ applicant.urls.allocations }}" class="button boring">Allocate</a>
37-
</td>
38-
{% else %}
39-
<td class="empty">(hidden)</td>
40-
<td class="empty">(hidden)</td>
41-
<td>
42-
<a href="{{ applicant.urls.view }}" class="button">Score</a>
43-
</td>
44-
{% endif %}
45-
</tr>
46-
{% empty %}
47-
<tr>
48-
<td colspan="3" class="empty">No applicants.</td>
49-
</tr>
50-
{% endfor %}
51-
</table>
9+
<table class="nice">
10+
<tr>
11+
<th>Name</th>
12+
<th>Applied</th>
13+
<th>Score</th>
14+
<th>Allocated</th>
15+
<th></th>
16+
</tr>
17+
{% for applicant in applicants %}
18+
<tr>
19+
<td>{{ applicant.name }}</td>
20+
<td class="small">{{ applicant.applied|date:"j M Y P" }}</td>
21+
{% if applicant.has_scored %}
22+
<td>
23+
{{ applicant.average_score|floatformat:"1"|default:"-" }}
24+
<span class="num_votes">({{ applicant.scores.count }} vote{{ applicant.scores.count|pluralize }})</span>
25+
</td>
26+
<td class="{% if not applicant.allocations.exists %}empty{% endif %}">
27+
{% for allocation in applicant.allocations.all %}
28+
<i class="fa fa-{{ allocation.resource.fa_icon }}"></i> {{ allocation.amount }}&nbsp;
29+
{% empty %}
30+
(none)
31+
{% endfor %}
32+
</td>
33+
<td>
34+
<a href="{{ applicant.urls.view }}" class="button boring">View</a>
35+
<a href="{{ applicant.urls.allocations }}" class="button boring">Allocate</a>
36+
</td>
37+
{% else %}
38+
<td class="empty">(hidden)</td>
39+
<td class="empty">(hidden)</td>
40+
<td>
41+
<a href="{{ applicant.urls.view }}" class="button">Score</a>
42+
</td>
43+
{% endif %}
44+
</tr>
45+
{% empty %}
46+
<tr>
47+
<td colspan="3" class="empty">No applicants.</td>
48+
</tr>
49+
{% endfor %}
50+
</table>
5251

53-
<div class="action-bar">
54-
<a href="{{ program.urls.applicants_bulk }}" class="button boring">Bulk load applicants</a>
55-
<a href="{{ program.urls.scores_bulk }}" class="button boring">Bulk load your scores</a>
56-
</div>
52+
<div class="action-bar">
53+
<a href="{{ program.urls.applicants_bulk }}" class="button boring">Bulk load applicants</a>
54+
<a href="{{ program.urls.scores_bulk }}" class="button boring">Bulk load your scores</a>
5755
</div>
5856
</div>
5957
{% endblock %}

0 commit comments

Comments
 (0)