From 53e467ea34fa6f63228ad2d27466a3a6daf796bb Mon Sep 17 00:00:00 2001 From: Ronit Jadhav Date: Mon, 25 Mar 2024 11:17:57 +0100 Subject: [PATCH 1/2] Updated the deault main and title font for datahub --- apps/datahub/src/app/app.module.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/datahub/src/app/app.module.ts b/apps/datahub/src/app/app.module.ts index 51389edc22..9c4b458339 100644 --- a/apps/datahub/src/app/app.module.ts +++ b/apps/datahub/src/app/app.module.ts @@ -211,10 +211,10 @@ export class AppModule { getThemeConfig().SECONDARY_COLOR, getThemeConfig().MAIN_COLOR, getThemeConfig().BACKGROUND_COLOR, - getThemeConfig().MAIN_FONT || "'Source Sans', sans-serif", - getThemeConfig().TITLE_FONT || "'Public Sans Semi-Bold', sans-serif", + getThemeConfig().MAIN_FONT || "'Rubik', sans-serif", + getThemeConfig().TITLE_FONT || "'Readex Pro', sans-serif", getThemeConfig().FONTS_STYLESHEET_URL || - 'https://fonts.googleapis.com/css2?family=Public+Sans:wght@600&family=Source+Sans+Pro&display=swap' + 'https://fonts.googleapis.com/css2?family=Readex+Pro&family=Rubik&display=swap' ) ThemeService.generateBgOpacityClasses( 'primary', From 05f238bed98992ff7fc7264bb742091962fff2c2 Mon Sep 17 00:00:00 2001 From: Ronit Jadhav Date: Mon, 25 Mar 2024 11:41:54 +0100 Subject: [PATCH 2/2] Removed font-weight from the font-title --- .../app/home/navigation-menu/navigation-menu.component.html | 2 +- tailwind.base.config.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/datahub/src/app/home/navigation-menu/navigation-menu.component.html b/apps/datahub/src/app/home/navigation-menu/navigation-menu.component.html index 3b9587facd..2e795396d8 100644 --- a/apps/datahub/src/app/home/navigation-menu/navigation-menu.component.html +++ b/apps/datahub/src/app/home/navigation-menu/navigation-menu.component.html @@ -6,7 +6,7 @@ ? 'decoration-primary' : 'decoration-transparent hover:decoration-primary transition-colors' " - class="hidden sm:block sm:py-4 uppercase truncate font-title text-sm underline decoration-4 underline-offset-[19px]" + class="hidden sm:block sm:py-4 uppercase truncate underline decoration-4 underline-offset-[19px]" [style.color]="foregroundColor" translate > diff --git a/tailwind.base.config.js b/tailwind.base.config.js index eb1bf3598e..faea732f64 100644 --- a/tailwind.base.config.js +++ b/tailwind.base.config.js @@ -52,9 +52,6 @@ module.exports = { 'var(--font-family-title, ui-serif, Georgia, Cambria, "Times New Roman", Times, serif)', // alias for serif mono: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace', }, - fontWeight: { - title: '600', - }, fontSize: { 13: '13px', 21: [