← Back to team overview

sts-sponsors team mailing list archive

[Merge] ~petermakowski/maas-site-manager:set-correct-fonts-path into maas-site-manager:main

 

Peter Makowski has proposed merging ~petermakowski/maas-site-manager:set-correct-fonts-path into maas-site-manager:main.

Commit message:
fix: set correct vanilla $assets-path
- update font assets to vanilla-framework 3.13.0


Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/440940

Set correct vanilla framework assets path for it to use local font assets
-- 
Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:set-correct-fonts-path into maas-site-manager:main.
diff --git a/frontend/assets/fonts/086e42aa-Ubuntu[wdth,wght]-cyrillic.woff2 b/frontend/assets/fonts/086e42aa-Ubuntu[wdth,wght]-cyrillic.woff2
deleted file mode 100644
index 6414141..0000000
Binary files a/frontend/assets/fonts/086e42aa-Ubuntu[wdth,wght]-cyrillic.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/0bd4277a-UbuntuMono[wght]-latin.woff2 b/frontend/assets/fonts/0bd4277a-UbuntuMono[wght]-latin.woff2
deleted file mode 100644
index 5b5243d..0000000
Binary files a/frontend/assets/fonts/0bd4277a-UbuntuMono[wght]-latin.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/15be2ffe-UbuntuBeta0.865[wdth,wght]-latin.woff2 b/frontend/assets/fonts/15be2ffe-UbuntuBeta0.865[wdth,wght]-latin.woff2
new file mode 100644
index 0000000..0546c7a
Binary files /dev/null and b/frontend/assets/fonts/15be2ffe-UbuntuBeta0.865[wdth,wght]-latin.woff2 differ
diff --git a/frontend/assets/fonts/57fdffc1-Ubuntu[wdth,wght]-greek.woff2 b/frontend/assets/fonts/57fdffc1-Ubuntu[wdth,wght]-greek.woff2
deleted file mode 100644
index c8a4c74..0000000
Binary files a/frontend/assets/fonts/57fdffc1-Ubuntu[wdth,wght]-greek.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/77e5f6a2-Ubuntu[wdth,wght]-greek-extended.woff2 b/frontend/assets/fonts/77e5f6a2-Ubuntu[wdth,wght]-greek-extended.woff2
deleted file mode 100644
index afda811..0000000
Binary files a/frontend/assets/fonts/77e5f6a2-Ubuntu[wdth,wght]-greek-extended.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/7d55b1fc-Ubuntu[wdth,wght]-cyrillic-extended.woff2 b/frontend/assets/fonts/7d55b1fc-Ubuntu[wdth,wght]-cyrillic-extended.woff2
deleted file mode 100644
index 814d29a..0000000
Binary files a/frontend/assets/fonts/7d55b1fc-Ubuntu[wdth,wght]-cyrillic-extended.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/a312a7ed-Ubuntu[wdth,wght]-latin-extended.woff2 b/frontend/assets/fonts/a312a7ed-Ubuntu[wdth,wght]-latin-extended.woff2
deleted file mode 100644
index c8eaf16..0000000
Binary files a/frontend/assets/fonts/a312a7ed-Ubuntu[wdth,wght]-latin-extended.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/a84821f4-UbuntuBeta0.865-Italic[wdth,wght]-latin.woff2 b/frontend/assets/fonts/a84821f4-UbuntuBeta0.865-Italic[wdth,wght]-latin.woff2
new file mode 100644
index 0000000..e79a636
Binary files /dev/null and b/frontend/assets/fonts/a84821f4-UbuntuBeta0.865-Italic[wdth,wght]-latin.woff2 differ
diff --git a/frontend/assets/fonts/c1b12cdf-Ubuntu-Italic[wdth,wght]-latin.woff2 b/frontend/assets/fonts/c1b12cdf-Ubuntu-Italic[wdth,wght]-latin.woff2
deleted file mode 100644
index 79350f7..0000000
Binary files a/frontend/assets/fonts/c1b12cdf-Ubuntu-Italic[wdth,wght]-latin.woff2 and /dev/null differ
diff --git a/frontend/assets/fonts/ec568c8f-UbuntuMonoBeta0.865[wght]-latin.woff2 b/frontend/assets/fonts/ec568c8f-UbuntuMonoBeta0.865[wght]-latin.woff2
new file mode 100644
index 0000000..d6e1947
Binary files /dev/null and b/frontend/assets/fonts/ec568c8f-UbuntuMonoBeta0.865[wght]-latin.woff2 differ
diff --git a/frontend/assets/fonts/f3b9cc97-Ubuntu[wdth,wght]-latin.woff2 b/frontend/assets/fonts/f3b9cc97-Ubuntu[wdth,wght]-latin.woff2
deleted file mode 100644
index 0d76f5b..0000000
Binary files a/frontend/assets/fonts/f3b9cc97-Ubuntu[wdth,wght]-latin.woff2 and /dev/null differ
diff --git a/frontend/src/_settings.scss b/frontend/src/_settings.scss
index 55a751d..e9258a2 100644
--- a/frontend/src/_settings.scss
+++ b/frontend/src/_settings.scss
@@ -7,6 +7,4 @@ $breakpoint-xx-large: 1920px;
 $side-navigation-z-index: 103;
 $application-layout--breakpoint-side-nav-expanded: $breakpoint-xx-large;
 
-// TODO: uncomment and use local assets path once implemented
-// https://warthogs.atlassian.net/browse/MAASENG-1448
-// $assets-path: "/assets/fonts/";
+$assets-path: "/assets/fonts/";

Follow ups