From a3be7fa0eef5f69fae84bd5c9ca91353184fe833 Mon Sep 17 00:00:00 2001 From: codecalm Date: Wed, 22 Jan 2020 20:34:40 +0100 Subject: [PATCH] aria fixes --- pages/_includes/cards/invoices.html | 2 +- pages/_includes/layout/page-title-actions.html | 2 +- pages/_includes/layout/topnav.html | 11 +++++------ pages/_includes/ui/button.html | 2 +- scss/_variables.scss | 4 ++-- scss/fonts/_webfonts.scss | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index beaa8bbd..33e71c3e 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -42,7 +42,7 @@ {% for invoice in site.data.invoices limit: 8 %} - + 00{{ forloop.index | plus: 1400 }} {{ invoice.name }} diff --git a/pages/_includes/layout/page-title-actions.html b/pages/_includes/layout/page-title-actions.html index dac3fc80..c99e20a1 100644 --- a/pages/_includes/layout/page-title-actions.html +++ b/pages/_includes/layout/page-title-actions.html @@ -27,6 +27,6 @@ {% include ui/button.html text="New view" color="secondary" %} {% include ui/button.html icon="plus" text="Create new report" color="primary" class="ml-3 d-none d-sm-inline-block" %} - {% include ui/button.html icon="plus" icon-only=true color="primary" class="ml-3 d-sm-none" %} + {% include ui/button.html icon="plus" icon-only=true color="primary" class="ml-3 d-sm-none" text="Create new report" %} {% endif %} diff --git a/pages/_includes/layout/topnav.html b/pages/_includes/layout/topnav.html index f433848b..0959ba5e 100644 --- a/pages/_includes/layout/topnav.html +++ b/pages/_includes/layout/topnav.html @@ -10,7 +10,7 @@
- @@ -30,13 +30,12 @@
  • - + {% include ui/avatar.html src=person.photo size="sm" %} - {{ person.full_name }} - Administrator - + {{ person.full_name }} + Administrator +
    diff --git a/pages/_includes/ui/button.html b/pages/_includes/ui/button.html index 0bfed9d7..acdb0fbe 100644 --- a/pages/_includes/ui/button.html +++ b/pages/_includes/ui/button.html @@ -19,7 +19,7 @@ {% endif %} {% assign e = include.element | default: 'a' %} -<{{ e }}{% if e == 'a' %} href="{{ href }}"{% endif %}{% if include.type %} type="{{ include.type }}"{% endif %} class="btn{% if include.height %} btn-{{ include.height }}{% endif %}{% if color %} btn-{% if include.outline %}outline-{% endif %}{{ color }}{% endif %}{% if include.disabled %} disabled{% endif %}{% if include.square %} btn-square{% endif %}{% if include.pill %} btn-pill{% endif %}{% if include['size'] %} btn-{{ include['size'] }}{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.block %} btn-block{% endif %}{% if include.link %} btn-link{% endif %}{% if include.icon-only %} btn-icon{% endif %}"{% if include.external %} target="_blank" rel="noreferrer"{% endif %}{% if include.modal %} data-toggle="modal" data-target="#modal-{{ include.modal }}"{% endif %}> +<{{ e }}{% if e == 'a' %} href="{{ href }}"{% endif %}{% if include.type %} type="{{ include.type }}"{% endif %} class="btn{% if include.height %} btn-{{ include.height }}{% endif %}{% if color %} btn-{% if include.outline %}outline-{% endif %}{{ color }}{% endif %}{% if include.disabled %} disabled{% endif %}{% if include.square %} btn-square{% endif %}{% if include.pill %} btn-pill{% endif %}{% if include['size'] %} btn-{{ include['size'] }}{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.block %} btn-block{% endif %}{% if include.link %} btn-link{% endif %}{% if include.icon-only %} btn-icon{% endif %}"{% if include.external %} target="_blank" rel="noreferrer"{% endif %}{% if include.modal %} data-toggle="modal" data-target="#modal-{{ include.modal }}"{% endif %}{% if include.icon-only %} aria-label="{{ include.text | default: "Button" }}"{% endif %}> {% if include.spinner %} {% include ui/spinner.html color=false size="sm" class=spinner-class element="span" %}{% endif %} {% if include.icon %}{% include ui/icon.html icon=include.icon use-svg=true color=include.icon-color %}{% endif %} diff --git a/scss/_variables.scss b/scss/_variables.scss index c6ad55dd..77e4fec6 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -51,8 +51,8 @@ $white: #ffffff !default; $body-bg: $light !default; $body-color: $dark !default; -$text-muted: mix($body-color, #fff, 68%) !default; -$border-color: rgba(mix($body-color, #fff, 68%), .24) !default; +$text-muted: mix($body-color, #fff, 70%) !default; +$border-color: rgba(mix($body-color, #fff, 70%), .24) !default; $hover-bg: $light-white !default; $active-bg: rgba($blue, .06) !default; diff --git a/scss/fonts/_webfonts.scss b/scss/fonts/_webfonts.scss index 126fba6a..8bc416a7 100644 --- a/scss/fonts/_webfonts.scss +++ b/scss/fonts/_webfonts.scss @@ -1,5 +1,5 @@ @if $google-font { - $google-font-url: "https://fonts.googleapis.com/css?family=" + str-replace($google-font, " ", "+") + ":300,400,500,600,700" !default; + $google-font-url: "https://fonts.googleapis.com/css?family=" + str-replace($google-font, " ", "+") + ":300,400,500,600,700&display=swap" !default; @import url($google-font-url); } -- GitLab