Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added shell/assets/fonts/suse/suse-v2-latin-300.woff
Binary file not shown.
Binary file added shell/assets/fonts/suse/suse-v2-latin-300.woff2
Binary file not shown.
Binary file added shell/assets/fonts/suse/suse-v2-latin-600.woff
Binary file not shown.
Binary file added shell/assets/fonts/suse/suse-v2-latin-600.woff2
Binary file not shown.
Binary file added shell/assets/fonts/suse/suse-v2-latin-700.woff
Binary file not shown.
Binary file not shown.
Binary file added shell/assets/fonts/suse/suse-v2-latin-800.woff
Binary file not shown.
Binary file added shell/assets/fonts/suse/suse-v2-latin-800.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions shell/assets/styles/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ H1, H2, H3, H4, H5, H6 {
font-style: normal;
font-weight: 400;
margin: 0 0 10px 0;
font-family: var(--title-font-family, unset); // Use the var if set, otherwise unset and use the font defined by the parent
}

H1 {
Expand Down
54 changes: 53 additions & 1 deletion shell/assets/styles/fonts/_fontstack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,56 @@
src: local(''),
url('~@shell/assets/fonts/roboto-mono/roboto-mono-v13-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('~@shell/assets/fonts/roboto-mono/roboto-mono-v13-latin-regular.woff') format('woff'), /* Modern Browsers */
}
}

// SUSE Font

/* suse-300 - latin */
@font-face {
font-display: swap;
font-family: 'SUSE';
font-style: normal;
font-weight: 300;
src: url('~@shell/assets/fonts/suse/suse-v2-latin-300.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
url('~@shell/assets/fonts/suse/suse-v2-latin-300.woff') format('woff'), /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+, iOS 5+ */
}

/* suse-regular - latin */
@font-face {
font-display: swap;
font-family: 'SUSE';
font-style: normal;
font-weight: 400;
src: url('~@shell/assets/fonts/suse/suse-v2-latin-regular.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
url('~@shell/assets/fonts/suse/suse-v2-latin-regular.woff') format('woff'), /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+, iOS 5+ */
}

/* suse-600 - latin */
@font-face {
font-display: swap;
font-family: 'SUSE';
font-style: normal;
font-weight: 600;
src: url('~@shell/assets/fonts/suse/suse-v2-latin-600.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
url('~@shell/assets/fonts/suse/suse-v2-latin-600.woff') format('woff'), /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+, iOS 5+ */
}

/* suse-700 - latin */
@font-face {
font-display: swap;
font-family: 'SUSE';
font-style: normal;
font-weight: 700;
src: url('~@shell/assets/fonts/suse/suse-v2-latin-700.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
url('~@shell/assets/fonts/suse/suse-v2-latin-700.woff') format('woff'), /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+, iOS 5+ */
}

/* suse-800 - latin */
@font-face {
font-display: swap;
font-family: 'SUSE';
font-style: normal;
font-weight: 800;
src: url('~@shell/assets/fonts/suse/suse-v2-latin-800.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
url('~@shell/assets/fonts/suse/suse-v2-latin-800.woff') format('woff'), /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+, iOS 5+ */
}
2 changes: 2 additions & 0 deletions shell/assets/styles/themes/_suse.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

$jungle-120: #008657;

--title-font-family : 'SUSE', 'Lato', sans-serif;

&.theme-light {
--primary: #{$jungle-120};
--primary-text: #FFFFFF;
Expand Down
1 change: 1 addition & 0 deletions shell/components/nav/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ export default {

.product-name {
font-size: 16px;
font-family: var(--title-font-family, unset); // Use the var if set, otherwise unset and use the font defined by the parent
}

.side-menu-logo {
Expand Down
2 changes: 2 additions & 0 deletions shell/components/nav/TopLevelMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,8 @@ export default {
$option-height: $icon-size + $option-padding + $option-padding;

.side-menu {
font-family: var(--title-font-family, unset); // Use the var if set, otherwise unset and use the font defined by the parent

.menu {
position: absolute;
width: $app-bar-collapsed-width;
Expand Down