Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

Commit

Permalink
Merge 2a41643 into 1ea7a5a
Browse files Browse the repository at this point in the history
  • Loading branch information
@philli-m
philli-m committed Jul 25, 2019
2 parents 1ea7a5a + 2a41643 commit 77f64ca
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 37 deletions.
68 changes: 52 additions & 16 deletions apps/cms/contacts/templates/a4_candy_cms_contacts/form_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,62 @@

{% block content %}
<div class="l-wrapper">
<div class="l-center-6">
<div>
<h1>{{ page.header }}</h1>
{{ page.intro|richtext }}
<form action="{% pageurl page %}" method="POST">
<div class="form-group form-group--narrow">
{% csrf_token %}
{% for hidden_field in form.hidden_fields %}
{{ hidden_field }}
{% endfor %}
<div class="contact_form p-3 py-md-5">
<div class="l-center-6 text-center mb-md-5">
<h2>{{ page.form_page.header }}</h2>
<p>{{ page.form_page.intro|richtext }}</p>
</div>
<div class="row">
<div class="col-lg-5 offset-lg-1">
<form action="{% pageurl page.form_page %}" method="POST">
<div class="form-group">
{% csrf_token %}

{% include 'a4_candy_cms_contacts/form_fields.html' with fields=form.visible_fields %}
{% include 'a4_candy_cms_contacts/form_fields.html' with fields=page.form %}
</div>
<div class="u-spacer-bottom">
<button class="btn btn--primary btn--full" type="submit">{% trans "Send" %}</button>
</div>
</form>
</div>
<div class="col-lg-5 my-5 my-lg-0">
<div class="row mb-3 pb-3 position-relative">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<span class="font-weight-bold">Ihr Ansprechpartner</span><br>
<span>Moritz Ritter</span><br>
<span>Position</span>
</div>
<div class="contact_form__divider pt-3"></div>
</div>
<div class="row mb-3">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<span class="font-weight-bold">Hier finden Sie uns</span><br>
<span>Liquid Democracy e.V.</span><br>
<span>Am Sudhaus 2</span><br>
<span>12053 Berlin</span>
</div>
</div>
<div class="row mb-3 pb-3 position-relative">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<span class="font-weight-bold">So erreichen Sie uns</span><br>
<span>+49 (0) 30 6298 4840</span><br>
<span>hallo@liqd.net</span>
</div>
<div class="contact_form__divider pt-3"></div>
</div>
<div class="u-spacer-bottom">
<button class="btn btn--primary" type="submit">{% trans "Send" %}</button>
<div class="row mb-3">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<a>Facebook</a><br>
<a>Twitter</a><br>
<a>Github</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}


85 changes: 65 additions & 20 deletions apps/cms/pages/templates/a4_candy_cms_pages/home_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,79 @@

{% block content %}
<div class="l-wrapper">

<div class="homepage-header">
<div class="hompage__wrapper p-3">
<div class="row homepage-header">
<div class="col-lg-6">
<h1 class="homepage-header__teaser">{{ page.teaser|richtext }}</h1>
</div>
<div class="col-lg-6 homepage-header__image-wrapper">
{% image page.image width-770 as image %}
<img src="{{ image.url }}" alt="{{ image.alt }}" class="homepage-header__image" />
<div class="homepage-header__text">
<h1 class="homepage-title homepage-title--large">Beteiligung.in/<span class="marked cms-title--normal">jederstadt</span></h1>
<h1 class="homepage-title homepage-title--small">Beteiligung.in/<br><span class="marked cms-title--normal">jederstadt</span></h1>
<div class="cms-teaser">{{ page.teaser|richtext }}</div>
</div>
</div>
</div>

<div>{{ page.body|richtext }}</div>
<div>{{ page.body_streamfield }}</div>
<div>{{ page.body|richtext }}</div>
<div>{{ page.body_streamfield }}</div>

{% if page.form_page %}
<h1>{{ page.form_page.header }}</h1>
<p>{{ page.form_page.intro|richtext }}</p>
<form action="{% pageurl page.form_page %}" method="POST">
<div class="form-group form-group--narrow">
{% csrf_token %}
{% if page.form_page %}
<div class="contact_form p-3 py-md-5">
<div class="l-center-6 text-center mb-md-5">
<h2>{{ page.form_page.header }}</h2>
<p>{{ page.form_page.intro|richtext }}</p>
</div>
<div class="row">
<div class="col-lg-5 offset-lg-1">
<form action="{% pageurl page.form_page %}" method="POST">
<div class="form-group">
{% csrf_token %}

{% include 'a4_candy_cms_contacts/form_fields.html' with fields=page.form %}
{% include 'a4_candy_cms_contacts/form_fields.html' with fields=page.form %}
</div>
<div class="u-spacer-bottom">
<button class="btn btn--primary btn--full" type="submit">{% trans "Send" %}</button>
</div>
</form>
</div>
<div class="u-spacer-bottom">
<button class="btn btn--primary" type="submit">{% trans "Send" %}</button>
<div class="col-lg-5 my-5 my-lg-0">
<div class="row mb-3 pb-3 position-relative">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<span class="font-weight-bold">Ihr Ansprechpartner</span><br>
<span>Moritz Ritter</span><br>
<span>Position</span>
</div>
<div class="contact_form__divider pt-3"></div>
</div>
<div class="row mb-3">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<span class="font-weight-bold">Hier finden Sie uns</span><br>
<span>Liquid Democracy e.V.</span><br>
<span>Am Sudhaus 2</span><br>
<span>12053 Berlin</span>
</div>
</div>
<div class="row mb-3 pb-3 position-relative">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<span class="font-weight-bold">So erreichen Sie uns</span><br>
<span>+49 (0) 30 6298 4840</span><br>
<span>hallo@liqd.net</span>
</div>
<div class="contact_form__divider pt-3"></div>
</div>
<div class="row mb-3">
<div class="col-4 col-sm-3 col-md-4"></div>
<div class="col-8">
<a>Facebook</a><br>
<a>Twitter</a><br>
<a>Github</a>
</div>
</div>
</div>
</form>
{% endif %}
</div>
</div>
{% endif %}

</div>
{% endblock %}
1 change: 1 addition & 0 deletions liqd_product/assets/scss/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ $brand-danger-tint: contrast-stretch($text-color, mix($brand-danger, $body-bg, 3

$bg-tertiary: $brand-primary-tint !default;
$bg-secondary: mix($bg-tertiary, $body-bg, 50%) !default;
$bg-light: #f7f7f7;

$gray-light: #4d4d4d;
$gray-lighter: $text-secondary-color;
Expand Down
15 changes: 15 additions & 0 deletions liqd_product/assets/scss/components/_contact_form.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//nasty hack until forms are refactored
.contact_form {
.form-check-input {
width: 5% !important;
}
}

.contact_form__divider {
height: 2px;
width: 50%;
border-bottom: 2px solid $body-bg;
position: absolute;
bottom: 0;
left: 100px;
}
34 changes: 34 additions & 0 deletions liqd_product/assets/scss/components/_homepage.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
$spacer-xl: 5rem;

.hompage__wrapper {
background-color: $bg-light;

@media screen and (min-width: $breakpoint-lg) {
margin: -$r-spacer;
}
}

.homepage-header {
margin-bottom: $spacer-xl;
}

.homepage-header__image-wrapper {
display: flex;
justify-content: flex-end;
}

.homepage-header__image {
position: relative;
right: -32px;
height: 100%;
object-fit: cover;
}

.homepage-header__teaser {
font-family: $font-family-serif;
font-weight: normal;

b {
font-family: $font-family-base;
}
}
3 changes: 2 additions & 1 deletion liqd_product/assets/scss/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
@import 'components/breadcrumbs';
@import 'components/button';
@import 'components/category_formset';
@import 'components/cms';
@import 'components/commenting';
@import 'components/comments';
@import 'components/complete';
@import 'components/contact_form';
@import 'components/copyright';
@import 'components/dashboard_nav';
@import 'components/datepicker';
Expand All @@ -37,6 +37,7 @@
@import 'components/footer';
@import 'components/headings';
@import 'components/hero-unit';
@import 'components/homepage';
@import 'components/idea_remark';
@import 'components/item_detail';
@import 'components/label';
Expand Down

0 comments on commit 77f64ca

Please sign in to comment.