diff --git a/app/assets/javascripts/dashboardChart.js b/app/assets/javascripts/dashboardChart.js index 6bfe56bda..46f278b80 100644 --- a/app/assets/javascripts/dashboardChart.js +++ b/app/assets/javascripts/dashboardChart.js @@ -11,7 +11,7 @@ function prepareData(data) { function getChartOptions() { var fontFamily = - 'Inter,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif'; + 'PlusJakarta,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif'; return { responsive: true, legend: { labels: { fontFamily } }, diff --git a/app/assets/stylesheets/administrate/library/_variables.scss b/app/assets/stylesheets/administrate/library/_variables.scss index 3fdfcfd8d..87183a503 100644 --- a/app/assets/stylesheets/administrate/library/_variables.scss +++ b/app/assets/stylesheets/administrate/library/_variables.scss @@ -1,5 +1,5 @@ // Typography -$base-font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", +$base-font-family: PlusJakarta, Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif !default; $heading-font-family: $base-font-family !default; diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss index a6e0b1aa3..2035585bd 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss @@ -63,7 +63,7 @@ $black: #000; $white: #fff; $body-background: $white; $body-font-color: $color-body; -$body-font-family: 'Inter', +$body-font-family: 'PlusJakarta', -apple-system, system-ui, BlinkMacSystemFont, @@ -133,7 +133,7 @@ $header-styles: (small: ("h1": ("font-size": 24), $header-text-rendering: optimizeLegibility; $small-font-size: 80%; $header-small-font-color: $medium-gray; -$paragraph-lineheight: 1.45; +$paragraph-lineheight: 1.65; $paragraph-margin-bottom: var(--space-small); $paragraph-text-rendering: optimizeLegibility; $code-color: $black; diff --git a/app/javascript/dashboard/assets/scss/_typography.scss b/app/javascript/dashboard/assets/scss/_typography.scss index 7db0f2a46..ee35a9cf0 100644 --- a/app/javascript/dashboard/assets/scss/_typography.scss +++ b/app/javascript/dashboard/assets/scss/_typography.scss @@ -29,4 +29,5 @@ a { p { font-size: $font-size-small; + word-spacing: .12em; } diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss index ce06475a7..2b9229f69 100644 --- a/app/javascript/dashboard/assets/scss/_woot.scss +++ b/app/javascript/dashboard/assets/scss/_woot.scss @@ -1,4 +1,4 @@ -@import 'shared/assets/fonts/inter'; +@import 'shared/assets/fonts/plus-jakarta'; @import 'shared/assets/stylesheets/animations'; @import 'shared/assets/stylesheets/colors'; @import 'shared/assets/stylesheets/spacing'; diff --git a/app/javascript/dashboard/assets/scss/storybook.scss b/app/javascript/dashboard/assets/scss/storybook.scss index e9973b150..0d16ea4e4 100644 --- a/app/javascript/dashboard/assets/scss/storybook.scss +++ b/app/javascript/dashboard/assets/scss/storybook.scss @@ -1,4 +1,5 @@ @import 'shared/assets/fonts/inter'; +@import 'shared/assets/fonts/plus-jakarta'; @import 'shared/assets/stylesheets/animations'; @import 'shared/assets/stylesheets/colors'; @import 'shared/assets/stylesheets/spacing'; diff --git a/app/javascript/dashboard/assets/scss/super_admin/pages.scss b/app/javascript/dashboard/assets/scss/super_admin/pages.scss index 8e5b86989..a33da2693 100644 --- a/app/javascript/dashboard/assets/scss/super_admin/pages.scss +++ b/app/javascript/dashboard/assets/scss/super_admin/pages.scss @@ -1,3 +1,3 @@ -@import 'shared/assets/fonts/inter'; +@import 'shared/assets/fonts/plus-jakarta'; @import '../variables'; @import '~shared/assets/stylesheets/ionicons'; diff --git a/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue b/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue index b11f9b947..60b80f441 100644 --- a/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue +++ b/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue @@ -63,7 +63,7 @@ export default { diff --git a/app/javascript/portal/application.scss b/app/javascript/portal/application.scss index 866d21c14..3cdafb6ea 100644 --- a/app/javascript/portal/application.scss +++ b/app/javascript/portal/application.scss @@ -11,7 +11,7 @@ html, body { - font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji; + font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; height: 100%; diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Bold.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Bold.woff2 new file mode 100644 index 000000000..c837ead15 Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Bold.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraBold.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraBold.woff2 new file mode 100644 index 000000000..16e7e053e Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraBold.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraLight.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraLight.woff2 new file mode 100644 index 000000000..d78cf39bb Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraLight.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Italic.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Italic.woff2 new file mode 100644 index 000000000..e17d85323 Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Italic.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Light.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Light.woff2 new file mode 100644 index 000000000..3ec4977d3 Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Light.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Medium.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Medium.woff2 new file mode 100644 index 000000000..813623b61 Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Medium.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Regular.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Regular.woff2 new file mode 100644 index 000000000..5656ea76c Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Regular.woff2 differ diff --git a/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-SemiBold.woff2 b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-SemiBold.woff2 new file mode 100644 index 000000000..1ee032da8 Binary files /dev/null and b/app/javascript/shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-SemiBold.woff2 differ diff --git a/app/javascript/shared/assets/fonts/plus-jakarta.scss b/app/javascript/shared/assets/fonts/plus-jakarta.scss new file mode 100644 index 000000000..765d6a1b7 --- /dev/null +++ b/app/javascript/shared/assets/fonts/plus-jakarta.scss @@ -0,0 +1,63 @@ +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 200; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraLight.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Light.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Regular.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Italic.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Medium.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-SemiBold.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-Bold.woff2') format('woff2'); +} + +@font-face { + font-family: 'PlusJakarta'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: url('~shared/assets/fonts/PlusJakartaSans/PlusJakartaSans-ExtraBold.woff2') format('woff2'); +}