From 70bda27381f000eee77fcc29ed442341c41bbf7c Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Fri, 26 Oct 2018 13:56:43 +0200
Subject: [PATCH] Remote listing intro on lab pages and only add small lab
icon.
---
.../funds/templates/public_funds/lab_page.html | 16 ++++------------
.../src/sass/public/components/_image.scss | 10 ++++++++++
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/opentech/public/funds/templates/public_funds/lab_page.html b/opentech/public/funds/templates/public_funds/lab_page.html
index caaa7ec07..cc0c3c7c9 100644
--- a/opentech/public/funds/templates/public_funds/lab_page.html
+++ b/opentech/public/funds/templates/public_funds/lab_page.html
@@ -2,23 +2,15 @@
{% block header_modifier %}header--grey-pixels{% endblock %}
{# Dont include fixed apply button on this page #}
{% block apply_button %}{% endblock %}
-{% load wagtailcore_tags navigation_tags static %}
+{% load wagtailcore_tags wagtailimages_tags navigation_tags static %}
{% block content %}
{% include "public_funds/includes/lab_apply_cta.html" %}
<div class="wrapper">
<section class="section section--main section--top-bottom-space">
- <div class="media-box media-box--reverse media-box--bottom-space">
- {% include "utils/includes/media_box_icon.html" with page_icon=page.icon %}
-
- <div class="media-box__content">
- <h4>{{ page.title }}</h4>
- {% if page.introduction %}
- <p class="media-box__teaser">{{ page.introduction }}</p>
- {% endif %}
- </div>
- </div>
-
+ {% if page.icon %}
+ {% image page.icon fill-100x100 class="image--float-small" %}
+ {% endif %}
{% include_block page.body %}
</section>
</div>
diff --git a/opentech/static_src/src/sass/public/components/_image.scss b/opentech/static_src/src/sass/public/components/_image.scss
index 7eeac0d3f..75434900f 100644
--- a/opentech/static_src/src/sass/public/components/_image.scss
+++ b/opentech/static_src/src/sass/public/components/_image.scss
@@ -15,4 +15,14 @@
margin-bottom: 20px;
}
}
+
+ &--float-small {
+ display: block;
+ margin: 0 auto 10px auto;
+
+ @include media-query(small-tablet) {
+ float: right;
+ margin: 10px 0 10px 10px;
+ }
+ }
}
--
GitLab