diff --git a/opentech/public/funds/templates/public_funds/open_call_index_page.html b/opentech/public/funds/templates/public_funds/open_call_index_page.html index ac98b04e48d822fad9b6c945b5b42c657980c1b3..470ff1ab5c4162d91587ad9366b42df8bb3c7970 100644 --- a/opentech/public/funds/templates/public_funds/open_call_index_page.html +++ b/opentech/public/funds/templates/public_funds/open_call_index_page.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load wagtailcore_tags wagtailimages_tags %} +{% block body_class %}light-grey-bg{% endblock %} {% block content %} <div class="wrapper wrapper--small wrapper--inner-space-medium"> @@ -11,24 +12,18 @@ {% if open_call_submissions %} {% for submission in open_call_submissions %} - <div class="listing listing--not-a-link"> - <h4 class="listing__title">{{ submission.title }}</h4> - <a class="listing__button" href="{% pageurl submission.page %}">Build it</a> - </div> - <div> - <div> - <h5>Project Duration</h5> - {{ submission.get_duration_display }} - </div> - <div> - <h5>Name</h5> - {{ submission.get_full_name_display }} - </div> + <div class="listing listing--with-button"> + <h3 class="title">{{ submission.title }}</h3> + <a class="button listing__button" href="{% pageurl submission.page %}" target="_blank">Build it</a> <div class="rich-text rich-text--answers"> + <section> + <h4>Name</h4> + <span>{{ submission.get_full_name_display }}</span> + </section> + {{ submission.output_first_group_answers }} </div> </div> - {% endfor %} {% include "includes/pagination.html" with paginator_page=open_call_submissions %} diff --git a/opentech/static_src/src/sass/public/components/_grid.scss b/opentech/static_src/src/sass/public/components/_grid.scss index 27b722c1118f534bb9559c6ee1b5df613d3ae119..061952f998f6d5bec3c5bfa9a9ae10e001107b6a 100644 --- a/opentech/static_src/src/sass/public/components/_grid.scss +++ b/opentech/static_src/src/sass/public/components/_grid.scss @@ -127,6 +127,23 @@ margin: 0; } + &--proposal-info { + padding-bottom: 30px; + margin: 0 0 30px; + border-bottom: 1px solid $color--mid-grey; + grid-template-columns: 100%; + grid-gap: 10px; // sass-lint:disable-line no-misspelled-properties + + @include media-query(mob-landscape) { + margin: 0 0 30px; + grid-template-columns: 1fr 1fr; + } + + * { + margin: 0; + } + } + &--focus-areas { margin: 20px 0; grid-gap: 20px; // sass-lint:disable-line no-misspelled-properties diff --git a/opentech/static_src/src/sass/public/components/_listing.scss b/opentech/static_src/src/sass/public/components/_listing.scss index fd6d2dc3c48e1ca09732f6617dde4743b27cb36c..b6eab16cb9bca7a3981156826bd34d7d44d7e222 100644 --- a/opentech/static_src/src/sass/public/components/_listing.scss +++ b/opentech/static_src/src/sass/public/components/_listing.scss @@ -52,6 +52,18 @@ } } + &--with-button { + .button { + float: right; + } + + @include media-query(tablet-portrait) { + position: relative; + min-height: 180px; + padding: 30px; + } + } + &__title { margin-bottom: 5px; line-height: 1.2; diff --git a/opentech/static_src/src/sass/public/components/_rich-text.scss b/opentech/static_src/src/sass/public/components/_rich-text.scss index 4cde9575ffc48929b4beb3d5f268e14263fab5c4..0aee52ba6252392311974b6648682583c3d1c07d 100644 --- a/opentech/static_src/src/sass/public/components/_rich-text.scss +++ b/opentech/static_src/src/sass/public/components/_rich-text.scss @@ -1,10 +1,29 @@ .rich-text { margin-bottom: 2rem; + word-break: break-word; .form & { margin-bottom: 0; } + &--answers { + > section { + margin: 0 0 1rem; + + p:first-of-type { + margin-top: 0; + } + + p:empty { + margin: 0; + } + } + + h4 { + margin: 0; + } + } + a { font-weight: $weight--bold; border-bottom: 1px solid transparent;