diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
index 47380b0e4c80c68a41c39e3ca68474a91c73dc85..5cc8cc9b0e583c3e7c5bbf49c32130517068c74f 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
@@ -44,4 +44,5 @@
<script src="{% static 'js/apply/toggle-actions-panel.js' %}"></script>
<script src="{% static 'js/apply/toggle-reviewers.js' %}"></script>
<script src="{% static 'js/apply/toggle-sidebar.js' %}"></script>
+ <script src="{% static 'js/apply/submission-text-cleanup.js' %}"></script>
{% endblock %}
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
index 4f11172e9405e0a21527c14c99b5a4aa7cbbf300..ab0d66ee88020181b763d932bef573136a516b00 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -49,14 +49,14 @@
{% endblock %}
<div class="wrapper wrapper--sidebar">
{% if request.user|has_edit_perm:object and object.status == 'draft_proposal' and not request.user.is_apply_staff %}
- <div>
+ <div class="wrapper--sidebar--inner">
<h4>Congratulations!</h4>
<h5>Your {{ object.previous.stage }} application has been accepted.</h5>
<a class="button button--primary" href="{% url 'funds:submissions:edit' object.id %}">Start your {{ object.stage }} application</a>
</div>
{% else %}
- <div>
- <h6 class="heading heading--submission-meta">
+ <article class="wrapper--sidebar--inner">
+ <header class="heading heading--submission-meta heading-text zeta">
<span>Submitted: <strong>{{ object.submit_time.date }} by {{ object.user.get_full_name }}</strong></span>
<span>Last edited: <strong>{{ object.live_revision.timestamp.date }} by {{ object.live_revision.author }}</strong></span>
{% if request.user|has_edit_perm:object %}
@@ -70,10 +70,10 @@
<svg class="icon icon--padlock"><use xlink:href="#padlock"></use></svg>
</span>
{% endif %}
- </h6>
+ </header>
{% include "funds/includes/rendered_answers.html" %}
- </div>
+ </article>
{% endif %}
<aside class="sidebar">
@@ -131,5 +131,6 @@
{% block extra_js %}
<script src="{% static 'js/apply/tabs.js' %}"></script>
+ <script src="{% static 'js/apply/submission-text-cleanup.js' %}"></script>
{% endblock %}
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_form.html b/opentech/apply/funds/templates/funds/applicationsubmission_form.html
index ce956b2c6c511fd146bc2e61f3c654cfcf6926cf..4b9de190c67debb681a1de664af615bcbb8560cd 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_form.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_form.html
@@ -11,7 +11,7 @@
{% include "forms/includes/form_errors.html" with form=form %}
<div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
- <div>
+ <div class="wrapper--sidebar--inner">
<form class="form" action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form.media }}
diff --git a/opentech/apply/funds/templates/funds/includes/rendered_answers.html b/opentech/apply/funds/templates/funds/includes/rendered_answers.html
index 573d6bd2469cf29f53a865e030bd07300701ddfc..301e1820b640b35948f92e4f315f31917e038c6a 100644
--- a/opentech/apply/funds/templates/funds/includes/rendered_answers.html
+++ b/opentech/apply/funds/templates/funds/includes/rendered_answers.html
@@ -3,26 +3,26 @@
<div class="grid grid--proposal-info">
<div>
<h5>Requested Funding</h5>
- <p>{{ object.get_value_display }}</p>
+ {{ object.get_value_display }}
</div>
<div>
<h5>Project Duration</h5>
- <p>{{ object.get_duration_display }}</p>
+ {{ object.get_duration_display }}
</div>
<div>
<h5>Legal Name</h5>
- <p>{{ object.get_full_name_display }}{% if request.user.is_apply_staff %} (<a href="{% url 'wagtailusers_users:edit' object.user_id %}">Edit account</a>){% endif %}</p>
+ {{ object.get_full_name_display }}{% if request.user.is_apply_staff %} (<a href="{% url 'wagtailusers_users:edit' object.user_id %}">Edit account</a>){% endif %}
</div>
<div>
<h5>Email</h5>
- <p>{{ object.get_email_display }}</p>
+ {{ object.get_email_display }}
</div>
<div class="grid__cell--span-two">
<h5>Address</h5>
- <p>{{ object.get_address_display }}</p>
+ {{ object.get_address_display }}
</div>
</div>
<div class="rich-text rich-text--answers">
diff --git a/opentech/apply/stream_forms/templates/stream_forms/render_field.html b/opentech/apply/stream_forms/templates/stream_forms/render_field.html
index 8826fee6c0450155b406543ff9f1afd5d40e18fd..01afc0c0ce157203f85b21803c275c113c4fefca 100644
--- a/opentech/apply/stream_forms/templates/stream_forms/render_field.html
+++ b/opentech/apply/stream_forms/templates/stream_forms/render_field.html
@@ -1,10 +1,10 @@
{% if include_question %}
-<div>
- <h5>{{ value.field_label }}</h5>
+<section>
+ <h4>{{ value.field_label }}</h4>
{% endif %}
- <div>{% block data_display %}{{ data }}{% endblock %}</div>
+ {% block data_display %}<span>{{ data }}</span>{% endblock %}
{% if include_question %}
-</div>
+</section>
{% endif %}
diff --git a/opentech/public/news/templates/news/news_page.html b/opentech/public/news/templates/news/news_page.html
index 5dc991351ca93c9a60f29860618dba8a4849f6c4..632ffe69f2b485be1568910f4afbe85cc08b9629 100644
--- a/opentech/public/news/templates/news/news_page.html
+++ b/opentech/public/news/templates/news/news_page.html
@@ -2,25 +2,25 @@
{% load wagtailcore_tags wagtailimages_tags static %}
{% block content %}
-<div class="wrapper wrapper--small">
+<article class="wrapper wrapper--small">
- <h5 class="heading heading--author">
- {{ page.display_date|date:"D, Y-m-d H:i" }}
+ <header class="heading heading--author heading-text epsilon">
+ <time datetime="{{ page.display_date|date:"c" }}">{{ page.display_date|date:"D, Y-m-d H:i" }}</time>
{% if page.authors.all %}
| By:
{% for author in page.authors.all %}
<a href="{% pageurl author.author %}">{{ author.author }}</a>
{% endfor %}
{% endif %}
- </h5>
+ </header>
{% if page.introduction %}
<h4 class="heading heading--introduction">{{ page.introduction }}</h4>
{% endif %}
- <section class="main-body">
+ <div class="main-body">
{% include_block page.body %}
- </section>
+ </div>
{% if page.news_types.all %}
<ul class="list list--flex">
@@ -40,7 +40,7 @@
{% endif %}
{% include "includes/share.html" %}
-</div>
+</article>
{% include "includes/relatedcontent.html" with related_documents=page.related_documents.all related_pages=page.related_pages.all %}
diff --git a/opentech/public/people/templates/people/person_page.html b/opentech/public/people/templates/people/person_page.html
index 7ec3a90c775044c0c45e99552f22bdfc5e9493df..f6f605655f1c639264c935b87947a27a42b35f93 100644
--- a/opentech/public/people/templates/people/person_page.html
+++ b/opentech/public/people/templates/people/person_page.html
@@ -4,7 +4,7 @@
{% block content %}
<section class="wrapper wrapper--small wrapper--inner-space-large wrapper--sidebar">
- <div>
+ <div class="wrapper--sidebar--inner">
{% for person_type in page.person_types.all %}
<h5 class="heading heading--no-margin">{{ person_type }}</h5>
{% endfor %}
diff --git a/opentech/public/projects/templates/projects/project_page.html b/opentech/public/projects/templates/projects/project_page.html
index 40a87ce4729c77351392ee912607270d83b191ba..f67fd493293409fb65f32cf120dd0a8163d10f01 100644
--- a/opentech/public/projects/templates/projects/project_page.html
+++ b/opentech/public/projects/templates/projects/project_page.html
@@ -13,7 +13,7 @@
</div>
<div class="wrapper wrapper--sidebar wrapper--inner-space-small">
- <div>
+ <div class="wrapper--sidebar--inner">
{{ page.body }}
</div>
<div>
diff --git a/opentech/public/standardpages/templates/standardpages/information_page.html b/opentech/public/standardpages/templates/standardpages/information_page.html
index c91053b449e8c0ea4857fa941b3fef2312cef49b..8a22f0df064cc48c18b17441775cc0e1985ce414 100644
--- a/opentech/public/standardpages/templates/standardpages/information_page.html
+++ b/opentech/public/standardpages/templates/standardpages/information_page.html
@@ -4,7 +4,7 @@
{% block content %}
<div class="wrapper wrapper--flex">
- <section class="section section--main">
+ <article class="section section--main">
{% if page.introduction %}
<h4 class="heading heading--introduction">{{ page.introduction }}</h4>
{% endif %}
@@ -12,7 +12,7 @@
{% include_block page.body %}
{% include "includes/share.html" %}
- </section>
+ </article>
</div>
{% include "includes/relatedcontent.html" with related_pages=page.related_pages.all %}
diff --git a/opentech/static_src/src/images/otf_social.jpg b/opentech/static_src/src/images/otf_social.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..926ea5b4bacb3cac9ee4497acf6957eed08e4df0
Binary files /dev/null and b/opentech/static_src/src/images/otf_social.jpg differ
diff --git a/opentech/static_src/src/javascript/apply/submission-text-cleanup.js b/opentech/static_src/src/javascript/apply/submission-text-cleanup.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c5f7b813e0ae690f191ef71c7a35d8dba91dcfb
--- /dev/null
+++ b/opentech/static_src/src/javascript/apply/submission-text-cleanup.js
@@ -0,0 +1,14 @@
+(function ($) {
+
+ 'use strict';
+
+ $('p').each(function () {
+ // Detach (remove) p tag with only whitespace inside.
+ if ($.trim($(this).text()) === '') {
+ $(this).detach();
+ }
+ });
+
+
+})(jQuery);
+
diff --git a/opentech/static_src/src/sass/apply/abstracts/_mixins.scss b/opentech/static_src/src/sass/apply/abstracts/_mixins.scss
index 914ef8b120fea3459778be0486af072e167bacdf..24509a3ef802fb81c132e6610dc72a471817ad97 100644
--- a/opentech/static_src/src/sass/apply/abstracts/_mixins.scss
+++ b/opentech/static_src/src/sass/apply/abstracts/_mixins.scss
@@ -41,26 +41,20 @@
-webkit-overflow-scrolling: touch; // sass-lint:disable-line no-misspelled-properties
}
-// Output a rem and px fallback value for the given property
+// Output a rem value for the given property
@mixin rem($property, $values) {
- $px: ();
$rem: ();
@each $value in $values {
@if $value == 0 or $value == auto or $value == inherit {
- $px: append($px, $value);
$rem: append($rem, $value);
}
@else {
- $px: append($px, $value);
$rem: append($rem, rem(strip-unit($value)));
}
}
- // sass-lint:disable no-duplicate-properties
- #{$property}: $px;
#{$property}: $rem;
- // sass-lint:enddisable
}
// Output a `font-size: [x]rem;` declaration for the given px value
@@ -83,7 +77,7 @@
// Button mixin
@mixin button($bg, $hover-bg) {
width: 100%;
- padding: 10px 60px;
+ padding: .5em 60px;
font-weight: $weight--bold;
color: $color--white;
text-align: center;
diff --git a/opentech/static_src/src/sass/apply/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
index 73760616ee3a7c6fc9582893fee954f37d175b73..8f6c7113797a6ed556b4e59ef7446e7f88156958 100644
--- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss
+++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
@@ -65,8 +65,10 @@ $weight--normal: 400;
$weight--light: 200;
// Font sizes
-$base-font-size: 19px;
-$base-line-height: 29px;
+$base-font-size: 16px;
+$base-font-size-large: 19px;
+$base-line-height: 24px;
+$base-line-height-large: 29px;
$font-sizes: (
alpha: 72px,
beta: 42px,
diff --git a/opentech/static_src/src/sass/apply/base/_typography.scss b/opentech/static_src/src/sass/apply/base/_typography.scss
index d75226549a9732e6de0caa6cf0b880ab2406e975..4eefbfe42ff3ef94e3c5873d609b74afecf3df59 100644
--- a/opentech/static_src/src/sass/apply/base/_typography.scss
+++ b/opentech/static_src/src/sass/apply/base/_typography.scss
@@ -32,9 +32,8 @@ h1, h2, h3, h4, h5, h6,
}
// sass-lint:enddisable
-html,
.body-text {
- font-size: 16px;
+ @include responsive-font-sizes($base-font-size, $base-font-size-large);
}
// Default sizes
@@ -60,10 +59,12 @@ h5, %h5, .epsilon {
}
h6, %h6, .zeta {
- font-size: 15px;
+ @include font-size(zeta);
}
-small, .milli { @include font-size(milli); }
+small, .milli {
+ @include font-size(milli);
+}
// thin
@font-face {
diff --git a/opentech/static_src/src/sass/apply/components/_form.scss b/opentech/static_src/src/sass/apply/components/_form.scss
index 00ae2f53b50e76ab6b80a4e7811d436c51f061b3..44c94c9aea1d60515fde8b2ce023234235c57936 100644
--- a/opentech/static_src/src/sass/apply/components/_form.scss
+++ b/opentech/static_src/src/sass/apply/components/_form.scss
@@ -6,9 +6,8 @@
margin: 0 0 10px;
label {
- @extend %h4;
display: block;
- margin-bottom: 10px;
+ margin-bottom: .5em;
font-weight: $weight--bold;
}
}
@@ -31,15 +30,6 @@
position: relative;
margin: 1rem 0;
- @include media-query(tablet-portrait) {
- margin: 2rem 0;
-
- // reduce spacing on the profile page
- .profile & {
- margin: 1rem 0;
- }
- }
-
&:nth-of-type(1) {
margin-top: 0;
}
@@ -83,9 +73,8 @@
}
&__question {
- @extend %h4;
display: block;
- margin-bottom: 10px;
+ margin-bottom: .5em;
font-weight: $weight--bold;
// sass-lint:disable class-name-format
@@ -118,7 +107,6 @@
}
&__filters {
- @extend %h6;
display: flex;
padding: 10px 0 30px;
@@ -156,9 +144,6 @@
}
&__label {
- @extend %h5;
- font-weight: $weight--bold;
-
.wrapper--comments & {
font-size: 15px;
}
@@ -169,8 +154,6 @@
}
&__help {
- @extend %h6;
-
.profile & {
margin-top: 0;
}
@@ -182,7 +165,7 @@
> label {
display: block;
- margin-bottom: 10px;
+ margin-bottom: .5em;
}
}
@@ -231,7 +214,7 @@
input[type='datetime-local'] {
width: 100%;
max-width: 385px;
- padding: 10px;
+ padding: .4em;
border: 1px solid $color--mid-grey;
&:disabled {
@@ -298,10 +281,18 @@
}
}
- textarea {
+ textarea,
+ &__textarea {
+ display: block;
width: 100%;
- padding: 10px;
- border: 1px solid $color--light-grey;
+ padding: .4em;
+ margin-bottom: 1em;
+ border: 1px solid $color--mid-grey;
+ line-height: $base-line-height / $base-font-size;
+
+ @include media-query(tablet-portrait) {
+ max-width: 70%;
+ }
}
// Radio + Checkbox
@@ -383,23 +374,15 @@
.errorlist {
padding: 5px;
- margin-bottom: 5px;
+ margin-bottom: .2em;
background: $color--light-pink;
border: 1px solid $color--tomato;
}
- textarea,
- &__textarea {
- display: block;
- width: 100%;
- height: 100px;
- padding: 10px;
- margin-bottom: 20px;
+ .address {
+ padding: .4em;
border: 1px solid $color--mid-grey;
-
- @include media-query(tablet-portrait) {
- max-width: 70%;
- }
+ max-width: 410px;
}
}
diff --git a/opentech/static_src/src/sass/apply/components/_grid.scss b/opentech/static_src/src/sass/apply/components/_grid.scss
index 4a078d7bdff96b0d804b35ef9274d27a226703d2..f2196f68632d62f65512d353ed5ca064e947c2b1 100644
--- a/opentech/static_src/src/sass/apply/components/_grid.scss
+++ b/opentech/static_src/src/sass/apply/components/_grid.scss
@@ -70,6 +70,10 @@
}
}
+ &--no-margin {
+ margin: 0;
+ }
+
&--proposal-info {
padding-bottom: 30px;
margin: 0 0 30px;
diff --git a/opentech/static_src/src/sass/apply/components/_link.scss b/opentech/static_src/src/sass/apply/components/_link.scss
index bb2bb45d78ba2b82d1130b2f0f942133629e2479..65917654e32eb79eb5e59afb500db9050585f364 100644
--- a/opentech/static_src/src/sass/apply/components/_link.scss
+++ b/opentech/static_src/src/sass/apply/components/_link.scss
@@ -30,10 +30,6 @@
background: $color--light-blue;
transition: background-color, $transition;
- @include media-query(mob-landscape) {
- max-width: 300px;
- }
-
&:focus,
&:hover {
background-color: $color--dark-blue;
diff --git a/opentech/static_src/src/sass/apply/components/_rich-text.scss b/opentech/static_src/src/sass/apply/components/_rich-text.scss
index 7a8b80a3aa9e7cb6a349288bf66f9ad48c2b774a..4457e5494ae076fbaeb38f2d63f8b3b09b8d4fd6 100644
--- a/opentech/static_src/src/sass/apply/components/_rich-text.scss
+++ b/opentech/static_src/src/sass/apply/components/_rich-text.scss
@@ -3,11 +3,19 @@
word-break: break-word;
&--answers {
- > div {
+ > section {
margin: 0 0 1rem;
+
+ p:first-of-type {
+ margin-top: 0;
+ }
+
+ p:empty {
+ margin: 0;
+ }
}
- h5 {
+ h4 {
margin: 0;
}
}
diff --git a/opentech/static_src/src/sass/apply/components/_wrapper.scss b/opentech/static_src/src/sass/apply/components/_wrapper.scss
index 18e04f4270b3377c95a2cbca4d440b6bd0bf6a3d..cf14c2fe9e3c99c34137f3c664e107db9a940445 100644
--- a/opentech/static_src/src/sass/apply/components/_wrapper.scss
+++ b/opentech/static_src/src/sass/apply/components/_wrapper.scss
@@ -167,7 +167,7 @@
}
}
- > div:first-child {
+ &--inner {
flex: 1;
@include media-query(tablet-portrait) {
diff --git a/opentech/static_src/src/sass/public/abstracts/_mixins.scss b/opentech/static_src/src/sass/public/abstracts/_mixins.scss
index 59f09d3338fa80b61bd0c3800d6f9ce1a5041bf1..6fdf746fc0256459a21e87e02822f3f6560fc062 100644
--- a/opentech/static_src/src/sass/public/abstracts/_mixins.scss
+++ b/opentech/static_src/src/sass/public/abstracts/_mixins.scss
@@ -41,26 +41,20 @@
-webkit-overflow-scrolling: touch; // sass-lint:disable-line no-misspelled-properties
}
-// Output a rem and px fallback value for the given property
+// Output a rem value for the given property
@mixin rem($property, $values) {
- $px: ();
$rem: ();
@each $value in $values {
@if $value == 0 or $value == auto or $value == inherit {
- $px: append($px, $value);
$rem: append($rem, $value);
}
@else {
- $px: append($px, $value);
$rem: append($rem, rem(strip-unit($value)));
}
}
- // sass-lint:disable no-duplicate-properties
- #{$property}: $px;
#{$property}: $rem;
- // sass-lint:enddisable
}
// Output a `font-size: [x]rem;` declaration for the given px value
@@ -82,7 +76,7 @@
// Button mixin
@mixin button($bg, $hover-bg) {
- padding: 10px 60px;
+ padding: .5em 60px;
font-weight: $weight--bold;
color: $color--white;
background: $bg;
diff --git a/opentech/static_src/src/sass/public/abstracts/_variables.scss b/opentech/static_src/src/sass/public/abstracts/_variables.scss
index 73760616ee3a7c6fc9582893fee954f37d175b73..8f6c7113797a6ed556b4e59ef7446e7f88156958 100644
--- a/opentech/static_src/src/sass/public/abstracts/_variables.scss
+++ b/opentech/static_src/src/sass/public/abstracts/_variables.scss
@@ -65,8 +65,10 @@ $weight--normal: 400;
$weight--light: 200;
// Font sizes
-$base-font-size: 19px;
-$base-line-height: 29px;
+$base-font-size: 16px;
+$base-font-size-large: 19px;
+$base-line-height: 24px;
+$base-line-height-large: 29px;
$font-sizes: (
alpha: 72px,
beta: 42px,
diff --git a/opentech/static_src/src/sass/public/base/_typography.scss b/opentech/static_src/src/sass/public/base/_typography.scss
index 4fe29ffedcaf1de7a4f1c465bffcbfab466a4ed2..4eefbfe42ff3ef94e3c5873d609b74afecf3df59 100644
--- a/opentech/static_src/src/sass/public/base/_typography.scss
+++ b/opentech/static_src/src/sass/public/base/_typography.scss
@@ -32,9 +32,8 @@ h1, h2, h3, h4, h5, h6,
}
// sass-lint:enddisable
-html,
.body-text {
- @include responsive-font-sizes(16px, 19px);
+ @include responsive-font-sizes($base-font-size, $base-font-size-large);
}
// Default sizes
@@ -60,10 +59,12 @@ h5, %h5, .epsilon {
}
h6, %h6, .zeta {
- font-size: 15px;
+ @include font-size(zeta);
}
-small, .milli { @include font-size(milli); }
+small, .milli {
+ @include font-size(milli);
+}
// thin
@font-face {
diff --git a/opentech/static_src/src/sass/public/components/_form.scss b/opentech/static_src/src/sass/public/components/_form.scss
index 611b07aeda417dac4069d1a4b76ef9771b6b13e1..92050609b231f095180db8af3d2fcd634d60f871 100644
--- a/opentech/static_src/src/sass/public/components/_form.scss
+++ b/opentech/static_src/src/sass/public/components/_form.scss
@@ -9,9 +9,8 @@
margin: 0 0 10px;
label {
- @extend %h4;
display: block;
- margin-bottom: 10px;
+ margin-bottom: .5em;
font-weight: $weight--bold;
}
}
@@ -25,10 +24,6 @@
position: relative;
margin: 1rem 0;
- @include media-query(tablet-portrait) {
- margin: 2rem 0;
- }
-
&:nth-of-type(1) {
margin-top: 0;
}
@@ -72,9 +67,8 @@
}
&__question {
- @extend %h4;
display: block;
- margin-bottom: 10px;
+ margin-bottom: .5em;
font-weight: $weight--bold;
// sass-lint:disable class-name-format
@@ -106,17 +100,11 @@
// sass-lint:enddisable
}
- &__label {
- @extend %h5;
- font-weight: $weight--bold;
- }
-
&__required {
color: $color--purple;
}
&__help {
- @extend %h6;
}
&__item {
@@ -169,7 +157,7 @@
input[type='datetime-local'] {
width: 100%;
max-width: 385px;
- padding: 10px;
+ padding: .4em;
border: 1px solid $color--mid-grey;
}
@@ -234,8 +222,9 @@
textarea {
width: 100%;
- padding: 10px;
- border: 1px solid $color--light-grey;
+ padding: .4em;
+ border: 1px solid $color--mid-grey;
+ line-height: $base-line-height / $base-font-size;
}
// Radio + Checkbox
@@ -318,8 +307,14 @@
.errorlist {
padding: 5px;
- margin-bottom: 5px;
+ margin-bottom: .2em;
background: $color--light-pink;
border: 1px solid $color--tomato;
}
+
+ .address {
+ padding: .4em;
+ border: 1px solid $color--mid-grey;
+ max-width: 410px;
+ }
}
diff --git a/opentech/static_src/src/sass/public/components/_grid.scss b/opentech/static_src/src/sass/public/components/_grid.scss
index ffffac7b08d35c91c58dfc509b80790f4f518574..27b722c1118f534bb9559c6ee1b5df613d3ae119 100644
--- a/opentech/static_src/src/sass/public/components/_grid.scss
+++ b/opentech/static_src/src/sass/public/components/_grid.scss
@@ -71,10 +71,6 @@
grid-gap: 10px; // sass-lint:disable-line no-misspelled-properties
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
- .form & {
- margin: 0;
- }
-
> * {
flex-basis: initial;
width: auto;
diff --git a/opentech/static_src/src/sass/public/components/_nav.scss b/opentech/static_src/src/sass/public/components/_nav.scss
index d7ba92bde0b0cfc2e1c42cd81eab32c6e79889bf..64dba10c04bb8e0bebbef50ed0b5d9cfb3ef82e8 100644
--- a/opentech/static_src/src/sass/public/components/_nav.scss
+++ b/opentech/static_src/src/sass/public/components/_nav.scss
@@ -71,12 +71,10 @@
}
&--primary {
- @include font-size(epsilon);
margin: 0;
letter-spacing: 1px;
@include media-query(tablet-landscape) {
- @include font-size(zeta);
margin: 0 18px;
}
}
diff --git a/opentech/templates/base-apply.html b/opentech/templates/base-apply.html
index 2d885f89ccec0dd9c94b9a03a807bab836f0664e..db027ef13f48542defa6ff1b260900b179cb9eec 100644
--- a/opentech/templates/base-apply.html
+++ b/opentech/templates/base-apply.html
@@ -9,7 +9,7 @@
<!-- favicons -->
{% comment %}
- Generate favicons by http://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons.
+ Generate favicons by https://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons.
Then favicon.ico should be copied to a directory called "public" in the application root and puppet does some magic to serve it up at the site root.
{% endcomment %}
<link rel="icon" sizes="144x144" href="{% static 'images/favicons/android-chrome-144.png' %}">
diff --git a/opentech/templates/base.html b/opentech/templates/base.html
index e4b81750677a877eac14f192aab9286ff84d4668..94e1cd306d2ef3fa48167831508a0af03cccee3a 100644
--- a/opentech/templates/base.html
+++ b/opentech/templates/base.html
@@ -9,7 +9,7 @@
<!-- favicons -->
{% comment %}
- Generate favicons by http://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons.
+ Generate favicons by https://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons.
Then favicon.ico should be copied to a directory called "public" in the application root and puppet does some magic to serve it up at the site root.
{% endcomment %}
<link rel="icon" sizes="144x144" href="{% static 'images/favicons/android-chrome-144.png' %}">
@@ -32,10 +32,10 @@
<meta name="twitter:title" content="{{ page.title }}" />
<meta name="twitter:description" content="{{ page|social_text:request.site }}">
{% if page.social_image %}
- {% image page.social_image width-320 as social_img %}
- <meta name="twitter:image" content="{{ request.site.root_url }}{{ social_img.url }}">
+ {% image page.social_image width-320 as social_img %}
+ <meta name="twitter:image" content="{{ request.site.root_url }}{{ social_img.url }}">
{% else %}
- <!-- Add a default image to use for social sharing here in case one is not provided on the page. -->
+ <meta name="twitter:image" content="{{ request.site.root_url }}{% static 'images/otf_social.jpg' %}">
{% endif %}
<!--facebook opengraph tags-->
@@ -44,9 +44,9 @@
<meta property="og:url" content="{{ page.url }}" />
<meta property="og:title" content="{{ page.title }}" />
{% if page.social_image %}
- <meta property="og:image" content="http://{{ request.site.hostname }}{{ social_img.url }}" />
+ <meta property="og:image" content="{{ request.site.root_url }}{{ social_img.url }}" />
{% else %}
- <!-- Add a default image to use for social sharing here in case one is not provided on the page. -->
+ <meta property="og:image" content="{{ request.site.root_url }}{% static 'images/otf_social.jpg' %}" />
{% endif %}
<meta property="og:description" content="{{ page|social_text:request.site }}" />
<meta property="og:site_name" content="{{ settings.utils.SocialMediaSettings.site_name }}" />
diff --git a/opentech/templates/django/forms/widgets/multiple_input.html b/opentech/templates/django/forms/widgets/multiple_input.html
index a78adea4e6522c2dd83a591a0dda239072c986dc..7917a4ca075aba58e64911ef2bb084f9352c261f 100644
--- a/opentech/templates/django/forms/widgets/multiple_input.html
+++ b/opentech/templates/django/forms/widgets/multiple_input.html
@@ -1,5 +1,5 @@
{% with id=widget.attrs.id %}
- <ul{% if id %} id="{{ id }}"{% endif %} class="grid grid--two{% if widget.attrs.class %} {{ widget.attrs.class }} {% endif %}">
+ <ul{% if id %} id="{{ id }}"{% endif %} class="grid grid--no-margin grid--two{% if widget.attrs.class %} {{ widget.attrs.class }} {% endif %}">
{% for group, options, index in widget.optgroups %}
{% if group %}
<li>{{ group }}<ul{% if id %} id="{{ id }}_{{ index }}"{% endif %}>