From e06db74b8fa11d14eb5e1ba143bdee8591166041 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 5 Jan 2023 09:25:39 +0100 Subject: Merging upstream version 1.10.3+dfsg. Signed-off-by: Daniel Baumann --- build/font/css.hbs | 6 +++--- build/font/scss.hbs | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'build/font') diff --git a/build/font/css.hbs b/build/font/css.hbs index f651092..b6de062 100644 --- a/build/font/css.hbs +++ b/build/font/css.hbs @@ -4,9 +4,9 @@ src: {{{ fontSrc }}}; } -.{{prefix}}::before, -[class^="{{prefix}}-"]::before, -[class*=" {{prefix}}-"]::before { +.{{ prefix }}::before, +[class^="{{ prefix }}-"]::before, +[class*=" {{ prefix }}-"]::before { display: inline-block; font-family: {{ name }} !important; font-style: normal; diff --git a/build/font/scss.hbs b/build/font/scss.hbs index 2e64754..ce0617d 100644 --- a/build/font/scss.hbs +++ b/build/font/scss.hbs @@ -1,8 +1,9 @@ ${{ name }}-font: "{{ name }}" !default; ${{ name }}-font-dir: "{{ fontsUrl }}" !default; ${{ name }}-font-file: #{${{ name }}-font-dir}/#{${{ name }}-font} !default; -${{ name }}-font-hash: "28df46889dced875dea48cfe64755198" !default; -${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-hash}") format("woff2"), url("#{${{ name }}-font-file}.woff?#{${{ name }}-font-hash}") format("woff") !default; +${{ name }}-font-hash: "24e3eb84d0bcaf83d77f904c78ac1f47" !default; +${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-hash}") format("woff2"), + url("#{${{ name }}-font-file}.woff?#{${{ name }}-font-hash}") format("woff") !default; @font-face { font-display: block; @@ -10,9 +11,9 @@ ${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-has src: ${{ name }}-font-src; } -.{{prefix}}::before, -[class^="{{prefix}}-"]::before, -[class*=" {{prefix}}-"]::before { +.{{ prefix }}::before, +[class^="{{ prefix }}-"]::before, +[class*=" {{ prefix }}-"]::before { display: inline-block; font-family: ${{ name }}-font !important; font-style: normal; -- cgit v1.2.3