diff --git a/ui/Makefile.mk b/ui/Makefile.mk index 89dd808a..bd1c8641 100644 --- a/ui/Makefile.mk +++ b/ui/Makefile.mk @@ -233,12 +233,17 @@ $(ui/cjs.targets): $>/ui/%.cjs: ui/%.js | $>/ui/b/ $>/ui/.build1-stamp: $(ui/cjs.targets) # == Inter Typeface == -$>/ui/fonts/Inter-Medium.woff2: ui/Makefile.mk | $>/ui/fonts/ +$>/ui/fonts/InterVariable.woff2: ui/Makefile.mk | $>/ui/fonts/ $(QECHO) FETCH Inter Typeface - $Q cd $(@D) $(call foreachpair, AND_DOWNLOAD_SHAURL, \ - 9cd56084faa8cc5ee75bf6f3d01446892df88928731ee9321e544a682aec55ef https://github.com/rsms/inter/raw/v3.10/docs/font-files/Inter-Medium.woff2 ) + $Q $(RM) -r $>/ui/fonts/tmp-inter/ && mkdir $>/ui/fonts/tmp-inter/ + $Q cd $>/ui/fonts/tmp-inter/ $(call foreachpair, AND_DOWNLOAD_SHAURL, \ + 41b1253ed9b5e9cb5093249c8dd71f0094cb4dfb4ef92ec69125fcb90566e4c7 https://github.com/rsms/inter/releases/download/v4.0-beta9g/Inter-4.0-beta9g.zip ) + $Q cd $>/ui/fonts/tmp-inter/ \ + && unzip -q Inter-4.0-beta9g.zip \ + && mv web/InterVariable.woff2 .. + $Q $(RM) -r $>/ui/fonts/tmp-inter/ $Q touch $@ -$>/ui/.build1-stamp: $>/ui/fonts/Inter-Medium.woff2 +$>/ui/.build1-stamp: $>/ui/fonts/InterVariable.woff2 # == AnklangIcons == $>/ui/fonts/AnklangIcons.css: ui/Makefile.mk | $>/ui/fonts/ diff --git a/ui/b/aboutdialog.vue b/ui/b/aboutdialog.vue index 75a81551..715de482 100644 --- a/ui/b/aboutdialog.vue +++ b/ui/b/aboutdialog.vue @@ -17,7 +17,8 @@ } .b-aboutdialog .b-aboutdialog-header { grid-column: 1; - text-align: right; vertical-align: top; font-weight: bold; + text-align: right; vertical-align: top; + @include b-font-weight-bold(); padding-right: .5em; min-width: 15em; } .b-aboutdialog .b-aboutdialog-field { grid-column: 2; diff --git a/ui/b/clipview.js b/ui/b/clipview.js index 15dcc1e8..5f71d640 100644 --- a/ui/b/clipview.js +++ b/ui/b/clipview.js @@ -14,7 +14,6 @@ JsExtract.scss` display: inline-grid; margin: 0 0 0 2px; } -$b-clipview-font: normal 9px $b-theme-font-family !default; // the '9px' part is dynamically resized $b-clipview-font-color: rgba(255, 255, 255, 0.7) !default; $b-clipview-note-color: rgba(255, 255, 255, 0.7) !default; $b-clipview-color-hues: 75, 177, 320, 225, 45, 111, 5, 259, 165, 290; @@ -25,7 +24,7 @@ $b-clipview-color-hues: 75, 177, 320, 225, 45, 111, 5, 259, 165, 290; border: 0; .-canvas { display: inline; position: absolute; top: 0px; bottom: 0px; left: 0px; right: 0px; - --clipview-font-color: #{$b-clipview-font-color}; --clipview-font: #{$b-clipview-font}; + --clipview-font-color: #{$b-clipview-font-color}; --clipview-font: #{$b-canvas-font}; --clipview-note-color: #{$b-clipview-note-color}; --clipview-color-hues: $b-clipview-color-hues; box-shadow: inset 0px 0 1px #fff9, inset -1px 0 1px #000; diff --git a/ui/b/dialog.vue b/ui/b/dialog.vue index 3a720ab2..ae1d4479 100644 --- a/ui/b/dialog.vue +++ b/ui/b/dialog.vue @@ -59,7 +59,8 @@ } } .-header { - font-size: 1.5em; font-weight: bold; + font-size: 1.5em; + @include b-font-weight-bold(); justify-content: space-evenly; padding-bottom: 0.5em; border-bottom: 1px solid $b-modal-bordercol; diff --git a/ui/b/fed-object.vue b/ui/b/fed-object.vue index f83ba23f..cf69d0c5 100644 --- a/ui/b/fed-object.vue +++ b/ui/b/fed-object.vue @@ -20,7 +20,7 @@ + +