diff --git a/src/openforms/authentication/templates/of_authentication/logout_confirmation.html b/src/openforms/authentication/templates/of_authentication/logout_confirmation.html index 87443ba215..68a7c0d810 100644 --- a/src/openforms/authentication/templates/of_authentication/logout_confirmation.html +++ b/src/openforms/authentication/templates/of_authentication/logout_confirmation.html @@ -2,8 +2,8 @@ {% load i18n %} {% block card %} -
-
+
+

{% trans "You successfully logged out." %}

diff --git a/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html b/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html index c6e3d6644c..97751545cb 100644 --- a/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html +++ b/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html @@ -2,8 +2,8 @@ {% load i18n static %} {% block card %} -
-
+
+

{% blocktranslate with name=user.get_employee_name trimmed %} Logged in as employee {{ name }} @@ -11,7 +11,7 @@

-
+

{% blocktranslate trimmed %} When filling out a form for a client or company please enter additional information. diff --git a/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html b/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html index 7bb3d6c406..6bdd2e79ab 100644 --- a/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html +++ b/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html @@ -2,14 +2,14 @@ {% load i18n %} {% block card %} -

-
+
+

{% trans "Retrieve submission for co-signing" %}

-
+
{% block card_body %}

{% csrf_token %} diff --git a/src/openforms/submissions/templates/submissions/resume_form_error.html b/src/openforms/submissions/templates/submissions/resume_form_error.html index 715556092f..dcda69a120 100644 --- a/src/openforms/submissions/templates/submissions/resume_form_error.html +++ b/src/openforms/submissions/templates/submissions/resume_form_error.html @@ -2,8 +2,8 @@ {% load i18n %} {% block card %} -
-
+
+

{% if error.detail.code == 'form-inactive' %} {% trans "Sorry - this form is no longer available" %} @@ -13,7 +13,7 @@

-
+
{% if error.detail.code == 'form-inactive' %} {% blocktrans trimmed %} Unfortunately, this form is no longer in use. We apologise for any diff --git a/src/openforms/templates/403.html b/src/openforms/templates/403.html index 6ce9f9d563..89b79c4b39 100644 --- a/src/openforms/templates/403.html +++ b/src/openforms/templates/403.html @@ -2,14 +2,14 @@ {% load i18n %} {% block card %} -
-
+
+

{% trans "Sorry, you don't have access to this page (403)" %}

-
+
{% block card_body %}

{% blocktrans trimmed %} diff --git a/src/openforms/ui/static/ui/scss/components/_index.scss b/src/openforms/ui/static/ui/scss/components/_index.scss index f3abfc5251..326f917643 100644 --- a/src/openforms/ui/static/ui/scss/components/_index.scss +++ b/src/openforms/ui/static/ui/scss/components/_index.scss @@ -6,10 +6,8 @@ // Custom @import 'a11y-toolbar'; -@import 'card'; @import 'fa-icon'; @import 'list'; -@import 'nav'; @import 'skiplink'; @import 'toolbar'; @import 'typography'; diff --git a/src/openforms/ui/static/ui/scss/components/card/_card.scss b/src/openforms/ui/static/ui/scss/components/card/_card.scss deleted file mode 100644 index e682317ccd..0000000000 --- a/src/openforms/ui/static/ui/scss/components/card/_card.scss +++ /dev/null @@ -1,17 +0,0 @@ -@import '~microscope-sass/lib/color'; -@import '~microscope-sass/lib/responsive'; -@import '~microscope-sass/lib/typography'; - -.card { - @include color-background; - padding: $grid-margin-8; - box-sizing: border-box; - - @include mobile-only { - @include container-margin($properties: (padding-left, padding-right)); - } - - &__body { - @include rows(1, margin-top); - } -} diff --git a/src/openforms/ui/static/ui/scss/components/card/_index.scss b/src/openforms/ui/static/ui/scss/components/card/_index.scss deleted file mode 100644 index fac7a67adb..0000000000 --- a/src/openforms/ui/static/ui/scss/components/card/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'card'; \ No newline at end of file diff --git a/src/openforms/ui/static/ui/scss/components/nav/_constants.scss b/src/openforms/ui/static/ui/scss/components/nav/_constants.scss deleted file mode 100644 index 4f65b26737..0000000000 --- a/src/openforms/ui/static/ui/scss/components/nav/_constants.scss +++ /dev/null @@ -1,5 +0,0 @@ -$nav-height-primary-mobile: 70px!default; -$nav-height-primary-tablet: 70px!default; -$nav-height-secondary-mobile: 70px!default; -$nav-height-secondary-tablet: 40px!default; -$nav-min-height-tablet: $nav-height-primary-tablet + $nav-height-secondary-tablet!default; diff --git a/src/openforms/ui/static/ui/scss/components/nav/_index.scss b/src/openforms/ui/static/ui/scss/components/nav/_index.scss deleted file mode 100644 index a79f40ae1b..0000000000 --- a/src/openforms/ui/static/ui/scss/components/nav/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'nav'; diff --git a/src/openforms/ui/static/ui/scss/components/nav/_nav.scss b/src/openforms/ui/static/ui/scss/components/nav/_nav.scss deleted file mode 100644 index d53202287e..0000000000 --- a/src/openforms/ui/static/ui/scss/components/nav/_nav.scss +++ /dev/null @@ -1,233 +0,0 @@ -@import '~@fortawesome/fontawesome-free/scss/fontawesome'; -@import '~@fortawesome/fontawesome-free/scss/solid'; -@import '~microscope-sass/lib/color'; -@import '~microscope-sass/lib/responsive'; -@import '~microscope-sass/lib/transform'; -@import '~microscope-sass/lib/typography'; -@import 'constants'; - -.nav { - @media print { - display: none; - } - - @include mobile-only { - @include color-secondary(background-color); - height: $nav-height-primary-mobile + $nav-height-secondary-mobile; - position: relative; - z-index: 1000; - - &__body { - display: flex; - align-items: flex-start; - position: absolute; - width: 100%; - } - - // - // Button - // - - .button { - height: $nav-height-primary-mobile; - border: none; - } - - .button:disabled { - visibility: hidden; - } - - .button--open { - @include rotate(180); - display: block; - } - - // Fix color. - .button--primary { - @include color-primary(background-color); - } - - // Open. - &__body > .button--primary { - @include absolute; - z-index: 10; - } - - &__body > .button--primary:first-child .button__label { - font-size: 0; - } - - &__body > .button--primary:first-child .fa-icon { - margin-right: 0; - } - - &--open &__body > .button--primary:first-child { - display: none; - } - - // Close - &__body > .button--primary + .button { - @include absolute; - display: none; - } - - &--open &__body > .button--primary + .button { - display: flex; - } - - // Sub. - &__list-item .button--anchor { - visibility: hidden; - } - - &:not(#{&}--open) &__list-item &__list-item--active .button--anchor { - visibility: visible; - } - - // - // List - // - - &__list { - @include color-primary(background-color); - list-style: none; - margin: 0; - padding: 0; - box-sizing: border-box; - width: 100%; - } - - &--open &__body > &__list { - margin-top: $nav-height-primary-mobile; - } - - &__list-item &__list { - @include color-secondary(background-color); - } - - // - // List item - // - - &__list-item { - display: none; - flex-wrap: wrap; - position: relative; - } - - &__body > &__list > &__list-item--active, // Active primary item. - &__list--open > &__list-item, // Primary items when list open. - &:not(#{&}--open) &__list-item &__list-item--active // Active secondary item. - { - display: flex; - } - - // - // Anchor - // - - .utrecht-link { - @include body; - @include body--big; - @include color-background(color); - @include ellipsis; - display: flex; - align-items: center; - font-weight: bold; - height: $nav-height-primary-mobile; - padding: 0 $grid-margin-3; - } - - &__list-item &__list .utrecht-link { - @include color-primary; - height: $nav-height-secondary-mobile; - } - } - - @include tablet { - @include container($padding: false); - padding-bottom: $nav-height-secondary-tablet; - - // - // Button - // - - .button { - display: none; - } - - // - // List - // - - &__list { - display: flex; - list-style: none; - margin: 0; - padding: 0; - position: relative; - - &:before { - @include center-hv; - @include color-primary(background-color); - content: ''; - z-index: -1; - width: 100vw; - height: 100%; - } - } - - &__list-item &__list { - @include absolute(100%, 0); - display: none; - width: 100%; - - &:before { - @include color-secondary(background-color); - } - } - - &__list-item:hover &__list, - &__list-item--active &__list { - display: flex; - } - - // - // List item - // - - &__list-item { - z-index: 1; - } - - // - // Anchor - // - - .utrecht-link { - @include anchor(true); - @include body; - @include color-background(color); - @include ellipsis; - display: flex; - align-items: center; - height: $nav-height-secondary-tablet; - padding: 0 $grid-margin-3; - } - - &__body > &__list > &__list-item > .utrecht-link { - @include body--big; - height: $nav-height-primary-tablet; - } - - &__list-item:hover .utrecht-link, - &__list-item--active .utrecht-link { - @include color-secondary(background-color); - @include color-primary(color); - } - - &__list-item--active > .utrecht-link { - font-weight: bold; - } - } -} diff --git a/src/openforms/ui/templates/ui/views/abstract/detail.html b/src/openforms/ui/templates/ui/views/abstract/detail.html index 6b9b0050fd..b3233487dc 100644 --- a/src/openforms/ui/templates/ui/views/abstract/detail.html +++ b/src/openforms/ui/templates/ui/views/abstract/detail.html @@ -2,12 +2,12 @@ {% block inner-content %} {% block card %} -

-
+
+

{{ object }}

-
+
{% block card_body %}

{{ object }}