Skip to content

Commit

Permalink
Merge pull request #1022 from maykinmedia/fix/2079-make-bold
Browse files Browse the repository at this point in the history
💄 [#2079] Making profile-buttons bold, adjust cards
  • Loading branch information
alextreme authored Feb 13, 2024
2 parents 24228e0 + e8fa4ca commit ef6fe12
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% render_grid %}
{% if settings.DIGID_ENABLED and digid_url %}
{% render_column start=5 span=5 %}
{% render_card direction='horizontal' tinted=True %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{{ digid_url }}" class="link digid-logo">
<img class="digid-logo__image" src="{% static 'accounts/digid_logo.svg' %}" alt="DigiD inlogpagina">
</a>
Expand All @@ -18,7 +18,7 @@

{% if eherkenning_enabled and eherkenning_url %}
{% render_column start=5 span=5 %}
{% render_card direction='horizontal' tinted=True %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{{ eherkenning_url }}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
</a>
Expand All @@ -29,7 +29,7 @@

{% if login_allow_registration %}
{% render_column start=5 span=5 %}
{% render_card tinted=True %}
{% render_card tinted=True compact=True %}
<h1 class="h3">{% trans "Registreren met E-mail" %}</h1><br>
{% form form_object=form method="POST" id="registration-form" submit_text=_('Registreren') extra_classes="form__registration" show_required=True %}
{% endrender_card %}
Expand Down
12 changes: 6 additions & 6 deletions src/open_inwoner/accounts/templates/registration/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ <h1 class="h1">{% trans 'Welkom' %}</h1>
{% if settings.DIGID_ENABLED %}
{% get_solo 'digid_eherkenning_oidc_generics.OpenIDConnectDigiDConfig' as digid_oidc_config %}
{% if digid_oidc_config.enabled %}
{% render_card direction='horizontal' tinted=True %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{% url 'digid_oidc:init' %}" class="link digid-logo">
<img class="digid-logo__image" src="{% static 'accounts/digid_logo.svg' %}" alt="DigiD inlogpagina">
</a>
{% url 'digid_oidc:init' as href %}
{% link href=href text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %}
{% endrender_card %}
{% else %}
{% render_card direction='horizontal' tinted=True %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{% url 'digid:login' %}" class="link digid-logo">
<img class="digid-logo__image" src="{% static 'accounts/digid_logo.svg' %}" alt="DigiD inlogpagina">
</a>
Expand All @@ -41,15 +41,15 @@ <h1 class="h1">{% trans 'Welkom' %}</h1>
{% if eherkenning_enabled %}
{% get_solo 'digid_eherkenning_oidc_generics.OpenIDConnectEHerkenningConfig' as eherkenning_oidc_config %}
{% if eherkenning_oidc_config.enabled %}
{% render_card direction='horizontal' tinted=True %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{% url 'eherkenning_oidc:init' %}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
</a>
{% url 'eherkenning_oidc:init' as href %}
{% link href=href text=_('Inloggen met eHerkenning') secondary=True icon='arrow_forward' extra_classes="link--eherkenning" %}
{% endrender_card %}
{% else %}
{% render_card direction='horizontal' tinted=True %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{% url 'eherkenning:login' %}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
</a>
Expand All @@ -64,7 +64,7 @@ <h1 class="h1">{% trans 'Welkom' %}</h1>
{% get_solo 'mozilla_django_oidc_db.OpenIDConnectConfig' as oidc_config %}
{% get_solo 'configurations.SiteConfiguration' as site_config %}
{% if oidc_config.enabled and site_config.openid_enabled_for_regular_users %}
{% render_card tinted=True direction='horizontal' %}
{% render_card tinted=True compact=True direction='horizontal' %}
{% if site_config.openid_connect_logo %}
<a href="{% url 'oidc_authentication_init' %}" class="link digid-logo">
<img class="digid-logo__image" src="{{ site_config.openid_connect_logo.url }}" alt="{{ site_config.openid_connect_logo.default_alt_text }}">
Expand All @@ -80,7 +80,7 @@ <h1 class="h1">{% trans 'Welkom' %}</h1>
{% endif %}

{% if login_allow_registration %}
{% render_card tinted=True %}
{% render_card tinted=True compact=True %}
{% render_form id="login-form" method="POST" form=form show_required=True %}
{% csrf_token %}
<input type="hidden" name="next" value="{{next}}" />
Expand Down
4 changes: 4 additions & 0 deletions src/open_inwoner/scss/components/Card/Card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@
}
}

.link .link__text {
font-weight: bold;
}

/// Headings in cards

.h2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@
padding: var(--spacing-small) 0;
}
}

.button {
&--error {
font-weight: bold;
}
}
}
14 changes: 14 additions & 0 deletions src/open_inwoner/scss/components/Table/Tabled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,25 @@
display: flex;
justify-content: end;
}

.button {
&--transparent,
&--textless {
font-weight: bold;
}
}
}

&--force-right {
display: flex;
justify-content: end;

.button {
&--transparent,
&--textless {
font-weight: bold;
}
}
}

&--mobile-big {
Expand Down

0 comments on commit ef6fe12

Please sign in to comment.