Skip to content

Commit a2cac3e

Browse files
jiromaykinjiromaykin
committed
[#3081] Change columns
1 parent bd041b0 commit a2cac3e

File tree

7 files changed

+77
-9
lines changed

7 files changed

+77
-9
lines changed

‎src/open_inwoner/scss/components/Card/Card.scss

+4
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@
196196
color: var(--color-body);
197197
font-size: var(--font-size-body-small);
198198
}
199+
.card__text--small ~ .link {
200+
background-color: yellow;
201+
margin-top: var(--spacing-medium);
202+
}
199203

200204
&__text--dark {
201205
color: var(--font-color-body);

‎src/open_inwoner/scss/components/Form/Form.scss

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
}
107107

108108
@media (min-width: 360px) {
109-
&__control > .label .input,
110109
&__control > .label .input[type='file'] {
111110
max-width: var(--form-width);
112111
}

‎src/open_inwoner/scss/components/Plan/PlanCreate.scss

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
.form__control {
33
.label {
44
position: relative;
5-
max-width: var(--form-width);
65
}
76

87
[class*='icons'] {

‎src/open_inwoner/scss/components/Plan/PlanEdit.scss

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.plan-edit {
22
.form {
3-
max-width: var(--form-width);
43
.form__control [class*='icons'] {
54
transform: initial;
65
}
@@ -13,9 +12,6 @@
1312
input[type='file'] {
1413
min-width: 100%;
1514
}
16-
.input {
17-
max-width: var(--form-width);
18-
}
1915
}
2016
}
2117
}

‎src/open_inwoner/templates/pages/plans/choose-template.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@ <h1 class="utrecht-heading-1">{% trans "Kies een voorstel" %}</h1>
77
{% optional_paragraph configurable_text.plans_page.plans_intro %}
88

99
{% if request.user.get_active_contacts %}
10+
11+
<div class="grid">
12+
<div class="column column--start-3 column--span-7 ">
1013
{% render_form id="plan-form" form=form method="POST" %}
1114
{% csrf_token %}
1215
{% input form.title %}
1316

14-
{% date_field form.end_date icon="today" icon_position="after" %}
17+
{% date_field form.end_date icon="today" icon_position="after" %}
1518
{% checkboxes form.plan_contacts %}
19+
</div>
20+
</div>
21+
1622

1723
<div class="plan-template">
18-
<h2>{% trans "Kies een voorstel" %}</h2>
24+
<h1>{% trans "Kies een voorstel" %}</h1>
1925
<div class="plan-template__header">
2026
<span class="plan-tag">{% trans "Voorgesteld" %}</span>
2127
<div class="plan-template__row choice-list--single">

‎src/open_inwoner/templates/pages/plans/create-custom.html

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{% extends 'master.html' %}
2+
{% load i18n button_tags card_tags map_tags form_tags grid_tags icon_tags string_tags link_tags %}
3+
4+
{% block content %}
5+
<div class="plan-create plan-template">
6+
<div class="plan-template__header">
7+
<h1>{% trans "Start een nieuwe samenwerking" %}</h1>
8+
<div class="plan-template__row choice-list--single">
9+
<div class="label radio">
10+
{% button href="collaborate:plan_choose_template" text=_("Gebruik sjabloon") primary=True transparent=True extra_classes="link--bold" icon="insert_drive_file" icon_outlined=True %}
11+
</div>
12+
</div>
13+
</div>
14+
15+
{% render_grid %}
16+
{% render_column start=3 span=7 %}
17+
{% optional_paragraph configurable_text.plans_page.plans_intro %}
18+
19+
{% if request.user.get_active_contacts %}
20+
{% render_form id="plan-form" form=form method="POST" %}
21+
{% csrf_token %}
22+
{% input form.title %}
23+
{% input form.goal %}
24+
{% input form.description %}
25+
26+
{% date_field form.end_date icon="today" icon_position="after" %}
27+
{% checkboxes form.plan_contacts %}
28+
29+
30+
<div class="plan-template">
31+
<div class="label plan-template__row radio">
32+
<div>
33+
<input class="radio__input" type="radio" name="template" value="" id="id_template_0" {% if not form.data.template %}checked{% endif %}>
34+
<label class="radio__label" for="id_template_0">Geen template</label>
35+
</div>
36+
</div>
37+
</div>
38+
39+
{% if form.template.errors %}
40+
{% errors errors=form.template.errors %}
41+
{% endif %}
42+
</div>
43+
<div class="form__actions form__actions--fullwidth">
44+
{% button text=_("Maak samenwerking aan") primary=True type="submit" %}
45+
{% button href="collaborate:plan_list" icon="west" text=_("Terug naar Mijn samenwerkingen") icon_outlined=True transparent=True %}
46+
</div>
47+
{% endrender_form %}
48+
{% else %}
49+
<div class="utrecht-paragraph">
50+
{% url 'profile:contact_create' as contact_create %}
51+
{% link href=contact_create text=_("Maak je eerste contact aan voordat je een samenwerking start") icon="arrow_forward" icon_position="after" primary=True %}
52+
</div>
53+
{% endif %}
54+
55+
{% endrender_column %}
56+
{% endrender_grid %}
57+
58+
{% endblock %}

‎src/open_inwoner/templates/pages/plans/create.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block content %}
55
<div class="plan-create plan-template">
66
<div class="plan-template__header">
7-
<h2>{% trans "Start een nieuwe samenwerking" %}</h2>
7+
<h1>{% trans "Start een nieuwe samenwerking" %}</h1>
88
<div class="plan-template__row choice-list--single">
99
<div class="label radio">
1010
{% button href="collaborate:plan_choose_template" text=_("Gebruik sjabloon") primary=True transparent=True extra_classes="link--bold" icon="insert_drive_file" icon_outlined=True %}
@@ -13,6 +13,9 @@ <h2>{% trans "Start een nieuwe samenwerking" %}</h2>
1313
</div>
1414
{% optional_paragraph configurable_text.plans_page.plans_intro %}
1515

16+
{% render_grid %}
17+
{% render_column start=3 span=7 %}
18+
1619
{% if request.user.get_active_contacts %}
1720
{% render_form id="plan-form" form=form method="POST" %}
1821
{% csrf_token %}
@@ -49,4 +52,7 @@ <h2>{% trans "Start een nieuwe samenwerking" %}</h2>
4952
</div>
5053
{% endif %}
5154

55+
{% endrender_column %}
56+
{% endrender_grid %}
57+
5258
{% endblock %}

0 commit comments

Comments
 (0)