templates/account: remove padding overwrite for form-check and unify …

…a4-forms styles
liqd · Nov 11, 2024 · 1f42996 · 1f42996
1 parent 206239d
commit 1f42996
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 20 deletions.
diff --git a/changelog/_8425.md b/changelog/_8425.md
@@ -0,0 +1,6 @@
+## Added
+- `.narrow-wrapper__checkbox` to `narrow-wrapper.scss` to target `form-check` padding handling
+
+### Removed
+- a4-select.scss and renamed to a4-forms.scss
+- `form-check` padding overwrite in `form.scss`
diff --git a/meinberlin/assets/scss/components_user_facing/_narrow-wrapper.scss b/meinberlin/assets/scss/components_user_facing/_narrow-wrapper.scss
@@ -15,6 +15,12 @@
     }
 }
 
+.narrow-wrapper__checkbox {
+    .form-check {
+        padding-left: 0;
+    }
+  }
+
 .narrow-wrapper__footer {
     padding: 1em 0 3em;
 

diff --git a/...ts_user_facing/adhocracy4/_a4-select.scss → ...nts_user_facing/adhocracy4/_a4-forms.scss b/...ts_user_facing/adhocracy4/_a4-select.scss → ...nts_user_facing/adhocracy4/_a4-forms.scss
diff --git a/meinberlin/assets/scss/style_user_facing.scss b/meinberlin/assets/scss/style_user_facing.scss
@@ -54,8 +54,8 @@
 @import "components_user_facing/adhocracy4/a4-comments";
 @import "components_user_facing/adhocracy4/a4-control-bar-search";
 @import "components_user_facing/adhocracy4/a4-follow";
+@import "components_user_facing/adhocracy4/a4-forms";
 @import "components_user_facing/adhocracy4/a4-modal";
-@import "components_user_facing/adhocracy4/a4-select";
 @import "components_user_facing/adhocracy4/a4-poll";
 
 // ck-editor 

diff --git a/meinberlin/assets/scss/styles_user_facing/_form.scss b/meinberlin/assets/scss/styles_user_facing/_form.scss
@@ -8,7 +8,6 @@ button {
   cursor: pointer;
 }
 
-.form-check,
 .errorlist {
   padding-left: 0;
 }

diff --git a/meinberlin/templates/account/login.html b/meinberlin/templates/account/login.html
@@ -21,7 +21,8 @@ <h1>{% translate "Login" %}</h1>
 
             {% include "meinberlin_contrib/includes/form_field.html" with field=form.login %}
             {% include "meinberlin_contrib/includes/form_field.html" with field=form.password %}
-            {% include "meinberlin_contrib/includes/form_checkbox_field.html" with field=form.remember %}
+
+            {% include "meinberlin_contrib/includes/form_checkbox_field.html" with field=form.remember add_class="narrow-wrapper__checkbox" %}
 
             {% if redirect_field_value %}
                 <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>

diff --git a/meinberlin/templates/account/signup.html b/meinberlin/templates/account/signup.html
@@ -26,24 +26,26 @@ <h1>{% translate "Register" %}</h1>
             {% include 'meinberlin_contrib/includes/form_field.html' with field=form.password1 %}
             {% include 'meinberlin_contrib/includes/form_field.html' with field=form.password2 %}
 
-            {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=form.get_notifications %}
-            {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=form.get_newsletters %}
+            {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=form.get_notifications add_class="narrow-wrapper__checkbox" %}
+            {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=form.get_newsletters add_class="narrow-wrapper__checkbox" %}
 
-            <div class="form-check">
-                <label class="form-check-label">
-                    {{ form.terms_of_use|add_error_attr:"aria-invalid:true" }}
-                    {% blocktranslate with terms_of_use_url="/terms-of-use" privacy_policy="/datenschutz" %}I hereby expressly consent to the collection and processing (storage) of my data and expressly consent to the processing and publication of my ideas, comments and contributions as described in the privacy policy. I also confirm that I have read and accept the
-                    <a href="{{ terms_of_use_url }}" target="_blank">terms of use</a>
-                    and the
-                    <a href="{{ privacy_policy }}" target="_blank">privacy policy</a>.{% endblocktranslate %}
-                </label>
-                {% if form.terms_of_use.errors %}
-                    <ul class="errorlist" aria-live="assertive" aria-atomic="true">
-                        {% for error in form.terms_of_use.errors %}
-                            <li>{{ error|escape }}</li>
-                        {% endfor %}
-                    </ul>
-                {% endif %}
+            <div class="narrow-wrapper__checkbox">
+                <div class="form-check">
+                    <label class="form-check-label">
+                        {{ form.terms_of_use|add_error_attr:"aria-invalid:true" }}
+                        {% blocktranslate with terms_of_use_url="/terms-of-use" privacy_policy="/datenschutz" %}I hereby expressly consent to the collection and processing (storage) of my data and expressly consent to the processing and publication of my ideas, comments and contributions as described in the privacy policy. I also confirm that I have read and accept the
+                        <a href="{{ terms_of_use_url }}" target="_blank">terms of use</a>
+                        and the
+                        <a href="{{ privacy_policy }}" target="_blank">privacy policy</a>.{% endblocktranslate %}
+                    </label>
+                    {% if form.terms_of_use.errors %}
+                        <ul class="errorlist" aria-live="assertive" aria-atomic="true">
+                            {% for error in form.terms_of_use.errors %}
+                                <li>{{ error|escape }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% endif %}
+                </div>
             </div>
 
             {% if form.captcha %}