Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(font): add option to use new red hat font #1813

Merged
merged 2 commits into from
Jul 12, 2019
Merged

feat(font): add option to use new red hat font #1813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f821f3
feat(font): add opt-in for new redhat font
mcoker Jun 21, 2019
dbd378c
fix(font): fix new font class typo
mcoker Jul 1, 2019
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
49 changes: 47 additions & 2 deletions src/patternfly/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,55 @@
// PatternFly uses Overpass and Overpass mono http://overpassfont.org/
//

/* stylelint-disable font-family-name-quotes */
@font-face {
font-family: "RedHatDisplay";
src: url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Regular.eot");
src: url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Regular.eot?#iefix") format("embedded-opentype"), url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Regular.woff") format("woff");
font-style: normal;
font-weight: 300;
text-rendering: optimizeLegibility;
}

@font-face {
font-family: "RedHatDisplay";
src: url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Medium.eot");
src: url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Medium.eot?#iefix") format("embedded-opentype"), url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Medium.woff") format("woff");
font-style: normal;
font-weight: 400;
text-rendering: optimizeLegibility;
}

@font-face {
font-family: "RedHatDisplay";
src: url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Bold.eot");
src: url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Bold.eot?#iefix") format("embedded-opentype"), url("#{$pf-global--font-path}/RedHatDisplay/RedHatDisplay-Bold.woff") format("woff");
font-style: normal;
font-weight: 700;
text-rendering: optimizeLegibility;
}

@font-face {
font-family: "RedHatText";
src: url("#{$pf-global--font-path}/RedHatText/RedHatText-Regular.eot");
src: url("#{$pf-global--font-path}/RedHatText/RedHatText-Regular.eot?#iefix") format("embedded-opentype"), url("#{$pf-global--font-path}/RedHatText/RedHatText-Regular.woff") format("woff");
font-style: normal;
font-weight: 400;
text-rendering: optimizeLegibility;
}

@font-face {
font-family: "RedHatText";
src: url("#{$pf-global--font-path}/RedHatText/RedHatText-Medium.eot");
src: url("#{$pf-global--font-path}/RedHatText/RedHatText-Medium.eot?#iefix") format("embedded-opentype"), url("#{$pf-global--font-path}/RedHatText/RedHatText-Medium.woff") format("woff");
font-style: normal;
font-weight: 700;
text-rendering: optimizeLegibility;
}

@if $pf-global--enable-font-overpass-cdn {
@import url("https://fonts.googleapis.com/css?family=Overpass|Overpass+Mono");
} @else {
// stylelint-disable
@font-face {
font-family: "overpass";
font-style: normal;
Expand Down Expand Up @@ -250,4 +295,4 @@
url("#{$pf-global--font-path}/overpass-mono-webfont/overpass-mono-bold.ttf") format("truetype");
}
}
// stylelint-enable
/* stylelint-enable */
13 changes: 13 additions & 0 deletions src/patternfly/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@

// Font family
--pf-global--FontFamily--sans-serif: #{$pf-global--FontFamily--sans-serif};
--pf-global--FontFamily--heading--sans-serif: #{$pf-global--FontFamily--heading--sans-serif};
--pf-global--FontFamily--monospace: #{$pf-global--FontFamily--monospace};
--pf-global--FontFamily--redhatfont--sans-serif: #{$pf-global--FontFamily--redhatfont--sans-serif};
--pf-global--FontFamily--redhatfont--heading--sans-serif: #{$pf-global--FontFamily--redhatfont--heading--sans-serif};

// Font size
--pf-global--FontSize--4xl: #{$pf-global--FontSize--4xl};
Expand All @@ -159,6 +162,7 @@
--pf-global--FontWeight--normal: #{$pf-global--FontWeight--normal};
--pf-global--FontWeight--semi-bold: #{$pf-global--FontWeight--semi-bold};
--pf-global--FontWeight--bold: #{$pf-global--FontWeight--bold};
--pf-global--FontWeight--redhatfont--bold: #{$pf-global--FontWeight--redhatfont--bold};

// Line height
--pf-global--LineHeight--sm: #{$pf-global--LineHeight--sm};
Expand All @@ -178,3 +182,12 @@
--pf-global--target-size--MinWidth: #{$pf-global--target-size--MinWidth};
--pf-global--target-size--MinHeight: #{$pf-global--target-size--MinHeight};
}

// RedHat Font overrides
@include pf-m-redhat-font {
--pf-global--FontFamily--sans-serif: var(--pf-global--FontFamily--redhatfont--sans-serif);
--pf-global--FontFamily--heading--sans-serif: var(--pf-global--FontFamily--redhatfont--heading--sans-serif);
--pf-global--FontWeight--semi-bold: var(--pf-global--FontWeight--redhatfont--bold);
--pf-global--FontWeight--bold: var(--pf-global--FontWeight--redhatfont--bold);
--pf-global--link--FontWeight: var(--pf-global--FontWeight--normal);
}
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Black.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Black.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Black.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-BlackItalic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-BlackItalic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-BlackItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Bold.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-BoldItalic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-BoldItalic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-BoldItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Italic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Italic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Medium.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Medium.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Medium.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-MediumItalic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-MediumItalic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-MediumItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Regular.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatDisplay/RedHatDisplay-Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Bold.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-BoldItalic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-BoldItalic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-BoldItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Italic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Italic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Medium.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Medium.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Medium.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-MediumItalic.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-MediumItalic.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-MediumItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Regular.eot
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/patternfly/assets/fonts/RedHatText/RedHatText-Regular.woff2
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions src/patternfly/assets/images/PF-Masthead-Logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/patternfly/components/Alert/alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,10 @@
padding-top: var(--pf-c-alert__action--PaddingTop);
padding-right: var(--pf-c-alert__action--PaddingRight);
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-alert__title {
font-weight: var(--pf-global--FontWeight--bold);
}
}
8 changes: 8 additions & 0 deletions src/patternfly/components/Breadcrumb/breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,11 @@
.pf-c-breadcrumb__heading {
font-size: var(--pf-c-breadcrumb__heading--FontSize);
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-breadcrumb {
--pf-c-breadcrumb__link--FontWeight: var(--pf-global--FontWeight--normal);
--pf-c-breadcrumb__item--FontWeight: var(--pf-global--FontWeight--normal);
}
}
7 changes: 7 additions & 0 deletions src/patternfly/components/Button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,3 +356,10 @@
}
}
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-button {
--pf-c-button--FontWeight: var(--pf-global--FontWeight--normal);
}
}
8 changes: 8 additions & 0 deletions src/patternfly/components/Card/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,11 @@
.pf-c-card__footer {
font-size: var(--pf-c-card__footer--FontSize);
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-card__header {
font-family: var(--pf-global--FontFamily--sans-serif);
font-weight: var(--pf-global--FontWeight--bold);
}
}
26 changes: 22 additions & 4 deletions src/patternfly/components/Content/content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,24 @@
// this ensures color is not overridden
--pf-c-content--Color: var(--pf-global--Color--100);

// h1 -main title
// Headings
--pf-c-content--heading--FontFamily: var(--pf-global--FontFamily--heading--sans-serif);

// h1
--pf-c-content--h1--MarginTop: var(--pf-global--spacer--lg);
--pf-c-content--h1--MarginBottom: var(--pf-global--spacer--sm);
--pf-c-content--h1--LineHeight: var(--pf-global--LineHeight--sm);
--pf-c-content--h1--FontSize: var(--pf-global--FontSize--2xl);
--pf-c-content--h1--FontWeight: var(--pf-global--FontWeight--normal);

// h2 - secondary title
// h2
--pf-c-content--h2--MarginTop: var(--pf-global--spacer--lg);
--pf-c-content--h2--MarginBottom: var(--pf-global--spacer--sm);
--pf-c-content--h2--LineHeight: var(--pf-global--LineHeight--sm);
--pf-c-content--h2--FontSize: var(--pf-global--FontSize--xl);
--pf-c-content--h2--FontWeight: var(--pf-global--FontWeight--normal);

// h3 - sub-title
// h3
--pf-c-content--h3--MarginTop: var(--pf-global--spacer--lg);
--pf-c-content--h3--MarginBottom: var(--pf-global--spacer--sm);
--pf-c-content--h3--LineHeight: var(--pf-global--LineHeight--md);
Expand Down Expand Up @@ -134,7 +137,11 @@
h3,
h4,
h5,
h6,
h6 {
margin: 0;
font-family: var(--pf-c-content--heading--FontFamily);
}

ol,
ul {
margin: 0;
Expand Down Expand Up @@ -296,3 +303,14 @@
}
}
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-content {
--pf-c-content--h2--LineHeight: var(--pf-global--LineHeight--md);
--pf-c-content--blockquote--FontWeight: var(--pf-global--FontWeight--normal);
--pf-c-content--h4--FontWeight: var(--pf-global--FontWeight--normal);
--pf-c-content--h5--FontWeight: var(--pf-global--FontWeight--normal);
--pf-c-content--h6--FontWeight: var(--pf-global--FontWeight--normal);
}
}
9 changes: 9 additions & 0 deletions src/patternfly/components/EmptyState/empty-state.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,12 @@
margin-bottom: var(--pf-c-empty-state__secondary--c-button--MarginBottom);
}
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-empty-state {
> .pf-c-title {
font-size: var(--pf-global--FontSize--xl);
}
}
}
7 changes: 7 additions & 0 deletions src/patternfly/components/Expandable/expandable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,10 @@
margin-top: var(--pf-c-expandable__content--MarginTop);
}
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-expandable__toggle {
--pf-c-expandable__toggle--FontWeight: var(--pf-global--FontWeight--normal);
}
}
12 changes: 12 additions & 0 deletions src/patternfly/components/Title/title.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.pf-c-title {
--pf-c-title--FontFamily: var(--pf-global--FontFamily--heading--sans-serif);

// 4xl
--pf-c-title--m-4xl--LineHeight: var(--pf-global--LineHeight--sm);
--pf-c-title--m-4xl--FontSize: var(--pf-global--FontSize--4xl);
Expand Down Expand Up @@ -29,6 +31,8 @@
--pf-c-title--m-md--FontSize: var(--pf-global--FontSize--md);
--pf-c-title--m-md--FontWeight: var(--pf-global--FontWeight--semi-bold);

font-family: var(--pf-c-title--FontFamily);

&.pf-m-4xl {
font-size: var(--pf-c-title--m-4xl--FontSize);
font-weight: var(--pf-c-title--m-4xl--FontWeight);
Expand Down Expand Up @@ -65,3 +69,11 @@
line-height: var(--pf-c-title--m-md--LineHeight);
}
}

// RedHat Font overrides
@include pf-m-redhat-font {
.pf-c-title {
--pf-c-title--m-lg--FontWeight: var(--pf-global--FontWeight--normal);
--pf-c-title--m-md--FontWeight: var(--pf-global--FontWeight--normal);
}
}
2 changes: 1 addition & 1 deletion src/patternfly/demos/CardView/examples/card-view-demo-example.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="Patternfly Logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="Patternfly Logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}

Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/DataList/data-list-page-header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}
{{#> page-template-header-tools-elements}}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/DataTable/data-table-page-header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}
{{#> page-template-header-tools-elements}}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/Page/examples/page-component-expandable-nav-example.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}
{{#> page-template-header-tools-elements}}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/Page/examples/page-component-grouped-nav-example.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}
{{#> page-template-header-tools-elements}}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/Page/examples/page-component-horizontal-nav-example.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{#> page-header}}
{{#> page-header-brand}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}
{{#> page-header-nav}}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/Page/examples/page-component-tertiary-nav-example.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}
{{#> page-template-header-tools-elements}}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/demos/Page/page-demo-default.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{/button}}
{{/page-header-brand-toggle}}
{{#> page-header-brand-link page-header-brand-link--href="#"}}
{{#> brand brand--attribute='src="/assets/images/l_pf-reverse-164x11.png" alt="PatternFly logo"'}}{{/brand}}
{{#> brand brand--attribute='src="/assets/images/PF-Masthead-Logo.svg" alt="PatternFly logo"'}}{{/brand}}
{{/page-header-brand-link}}
{{/page-header-brand}}

Expand Down
6 changes: 6 additions & 0 deletions src/patternfly/sass-utilities/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,9 @@

@extend %pf-hidden-visible;
}

@mixin pf-m-redhat-font {
.pf-m-redhat-font {
@content;
}
}
7 changes: 6 additions & 1 deletion src/patternfly/sass-utilities/scss-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,17 @@ $pf-global--icon--FontSize--xl: pf-font-prem(54px) !default;
// Font family
// stylelint-disable value-keyword-case
$pf-global--FontFamily--sans-serif: "overpass", overpass, "open sans", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, "Helvetica Neue", arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$pf-global--FontFamily--heading--sans-serif: $pf-global--FontFamily--sans-serif;
$pf-global--FontFamily--monospace: "overpass-mono", overpass-mono, "SFMono-Regular", menlo, monaco, consolas, "Liberation Mono", "Courier New", monospace !default;
$pf-global--FontFamily--redhatfont--sans-serif: "RedHatText", "Overpass", overpass, helvetica, arial, sans-serif;
$pf-global--FontFamily--redhatfont--heading--sans-serif: "RedHatDisplay", "Overpass", overpass, helvetica, arial, sans-serif;
// stylelint-enable value-keyword-case

// Font size
$pf-global--FontSize--4xl: pf-font-prem(36px) !default;
$pf-global--FontSize--3xl: pf-font-prem(28px) !default;
$pf-global--FontSize--2xl: pf-font-prem(24px) !default;
$pf-global--FontSize--xl: pf-font-prem(21px) !default;
$pf-global--FontSize--xl: pf-font-prem(20px) !default;
$pf-global--FontSize--lg: pf-font-prem(18px) !default;
$pf-global--FontSize--md: pf-font-prem(16px) !default;
$pf-global--FontSize--sm: pf-font-prem(14px) !default;
Expand All @@ -197,6 +200,8 @@ $pf-global--FontWeight--light: 300 !default;
$pf-global--FontWeight--normal: 400 !default;
$pf-global--FontWeight--semi-bold: 500 !default;
$pf-global--FontWeight--bold: 600 !default;
$pf-global--FontWeight--redhatfont--bold: 700 !default;


// Line height
$pf-global--LineHeight--sm: 1.3 !default;
Expand Down
2 changes: 1 addition & 1 deletion src/site/_site/FullPageExampleLayout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default ({ children }) => (
<div>
<Helmet>
<title>PatternFly 4</title>
<html lang="en-US" />
<html lang="en-US" className="pf-m-redhat-font" />
</Helmet>
<div>{children}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/site/_site/Layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default ({ children }) => (
<div className="layout">
<Helmet>
<title>PatternFly 4</title>
<html lang="en-US" />
<html lang="en-US" className="pf-m-redhat-font" />
</Helmet>
<header className="layout__header">
<h1>
Expand Down
1 change: 0 additions & 1 deletion src/site/_site/Navigation/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@

&:focus,
&:hover {
font-weight: 500;
color: var(--pf-global--link--Color);
text-decoration: none;
}
Expand Down
1 change: 1 addition & 0 deletions static/assets/images/PF-Masthead-Logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.