Skip to content

Change font to Red Hat #2668

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 17, 2019
Merged

Change font to Red Hat #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions frontend/packages/dev-console/src/components/import/section/FormSection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.odc-form-section {
&__heading {
font-size: var(--pf-global--FontSize--xl);
font-weight: var(--pf-global--FontWeight--semi-bold);
margin: 0px;
}
.odc-form-section__heading {
margin: 0;
}
2 changes: 1 addition & 1 deletion frontend/packages/dev-console/src/components/pipelineruns/PipelineTaskLogs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
&__stepname {
background-color: #030303;
color: var(--pf-global--BackgroundColor--100);
font-weight: 900;
font-weight: var(--pf-global--FontWeight--bold);
text-transform: uppercase;
margin: 0px;
padding: var(--pf-global--spacer--sm) var(--pf-global--spacer--md) var(--pf-global--spacer--sm)
Expand Down
2 changes: 0 additions & 2 deletions frontend/public/components/RBAC/_rbac.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@
}
.help-text {
color: $color-text-secondary;
font-weight: 400;
position: relative;
top: -3px;
left: 20px;
}
.checkbox-label {
margin-bottom: 5px;
font-weight: 400;
}

.rbac-minor {
Expand Down
2 changes: 0 additions & 2 deletions frontend/public/components/_edit-yaml.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
}

.yaml-editor__header-text {
font-size: 20px;
font-weight: 300;
margin: 0;
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/public/components/_global-notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ $global-notification-text: $color-pf-white;
}

.co-global-notification__impersonate-name {
font-weight: 700;
font-weight: var(--pf-global--FontWeight--bold);
}

.co-global-notification__impersonate-kind {
font-weight: 600;
font-weight: var(--pf-global--FontWeight--bold);
padding-right: 20px;
}
6 changes: 0 additions & 6 deletions frontend/public/components/_quota.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

.co-resource-quota-dashboard-scopes {
font-size: $font-size-h5;
font-weight: 300;
}

.co-resource-quota-gauge-chart {
Expand All @@ -19,9 +18,4 @@

.co-resource-quota-scope__description {
font-size: $font-size-small;
font-weight: 300;
}

.co-resource-quota-scope__label {
font-weight: 500;
}
13 changes: 6 additions & 7 deletions frontend/public/components/_resource.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
color: #fff;
display: inline-block;
flex-shrink: 0;
font-size: $font-size-base - 1;
font-weight: 300;
font-size: $font-size-base;
line-height: 16px;
margin-right: 4px;
min-width: 18px;
padding: 2px 4px 1px;
padding: 1px 4px;
text-align: center;
&--lg {
font-size: ($font-size-base + 1);
line-height: 21px;
font-size: ($font-size-base + 3);
line-height: 20px;
margin-right: 7px;
min-width: 24px;
padding: 0 7px;
Expand All @@ -24,7 +23,7 @@
display: flex;
justify-content: center;
text-align: center;
width: 43px;
width: 50px;
}

.co-m-resource-clusterrole,
Expand Down Expand Up @@ -126,7 +125,7 @@
animation: co-resource-icon__deleting 1.5s cubic-bezier(0.45, 0.05, 0.55, 0.95) alternate infinite;
flex: 0 0 auto;
font-size: ($font-size-base - 1);
font-weight: 600;
font-weight: var(--pf-global--FontWeight--bold);
margin: 0 0 0 15px;
overflow: hidden;
padding: 0 0 2px;
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/_row-filter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $color-row-filter-border--active: $color-pf-blue-300;
}

.co-m-row-filter__items {
font-weight: bold;
font-weight: var(--pf-global--FontWeight--bold);
padding: 7px 10px;
white-space: nowrap;
}
Expand Down
13 changes: 3 additions & 10 deletions frontend/public/components/catalog/_catalog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ $co-modal-ignore-warning-icon-width: 30px;
@include co-break-word;
}

// reset font size back to 13px since console h5 font size is 15px
// reset font size back to 13px since console h5 font size is 14px
.catalog-item-header-pf-subtitle {
font-size: 13px;
}

// reset font size back to 24px since console h1 font size is 26px
.catalog-item-header-pf-title {
font-size: 24px;
}

.catalog-tile-pf-body .catalog-tile-pf-subtitle {
font-size: ($font-size-base - 1);
}
Expand All @@ -39,7 +34,7 @@ $co-modal-ignore-warning-icon-width: 30px;
}

&__kind-label {
font-weight: 600;
font-weight: var(--pf-global--FontWeight--bold);
}

&__name {
Expand Down Expand Up @@ -126,7 +121,6 @@ $co-modal-ignore-warning-icon-width: 30px;

&__heading {
font-size: 16px;
font-weight: 400;
margin: 0 0 20px;
}

Expand All @@ -136,7 +130,7 @@ $co-modal-ignore-warning-icon-width: 30px;
}

&__num-items {
font-weight: 700;
font-weight: var(--pf-global--FontWeight--bold);
padding: 0 0 20px;
}

Expand Down Expand Up @@ -186,7 +180,6 @@ $co-modal-ignore-warning-icon-width: 30px;
}

.co-catalog-tab__empty {
font-weight: lighter;
color: $color-pf-black-600;
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/dashboard/capacity-card/capacity-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
}

.co-capacity-card__item-description {
font-weight: normal;
line-height: 1.5;
margin-bottom: 0;
}
Expand All @@ -28,5 +27,6 @@
}

.co-capacity-card__item-title {
font-family: $headings-font-family;
margin-top: 0;
}
5 changes: 2 additions & 3 deletions frontend/public/components/monitoring/_monitoring.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
.query-browser__expand-icon {
color: $color-pf-black-600;
font-size: 30px;
font-weight: 600;
vertical-align: middle;
}

Expand Down Expand Up @@ -197,7 +196,7 @@ $tooltip-background-color: #151515;
}

.query-browser__tooltip-label-key {
font-weight: 600;
font-weight: var(--pf-global--FontWeight--bold);
text-transform: uppercase;
}

Expand All @@ -207,7 +206,7 @@ $tooltip-background-color: #151515;
};

.query-browser__tooltip-value {
font-weight: 600;
font-weight: var(--pf-global--FontWeight--bold);
}

.query-browser__wrapper {
Expand Down
4 changes: 1 addition & 3 deletions frontend/public/components/operator-lifecycle-manager/_operator-lifecycle-manager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

.co-clusterserviceversion-empty__state__namespace {
font-style: italic;
font-weight: bold;
font-weight: var(--pf-global--FontWeight--bold);
}

.co-crd-card-row {
Expand Down Expand Up @@ -127,8 +127,6 @@
}

.co-create-operand__header-text {
font-size: 20px;
font-weight: 300;
margin: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/operator-lifecycle-manager/markdown-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class SyncMarkdownView extends React.Component<{content: string, styles?:
}
${this.props.styles ? this.props.styles : ''}
</style>
<body><div style="overflow-y: auto;">${markdownConvert(this.props.content || 'Not available')}</div></body>`;
<body class="pf-m-redhat-font"><div style="overflow-y: auto;">${markdownConvert(this.props.content || 'Not available')}</div></body>`;
return <iframe sandbox="allow-popups allow-same-origin" srcDoc={contents} style={{border: '0px', display: 'block', width: '100%', height: '0'}} ref={(r) => this.frame = r} onLoad={() => this.updateDimensions()} />;
}
}
10 changes: 5 additions & 5 deletions frontend/public/components/sidebars/_resource-sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
}
}

.co-resource-sidebar-item__header {
font-weight: 600;
}

.co-resource-sidebar-item__details {
margin: 0;
padding: 25px 0;
}

.co-resource-sidebar-item__header {
font-size: ($font-size-base + 2);
}

.co-resource-sidebar-item__img {
padding: 20px 0;
}

.co-role-sidebar-subheader {
font-weight: normal;
font-weight: var(--pf-global--FontWeight--normal);
}
1 change: 1 addition & 0 deletions frontend/public/components/utils/_alerts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
text-align: left;
// overrides Bootstrap-related line-height issue that causes the title and icon to go out of alignment
h4 {
font-family: $font-family-base;
line-height: var(--pf-global--LineHeight--md);
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/utils/_file-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

.co-file-dropzone__drop-text {
font-size: 20px;
font-weight: bolder;
font-weight: var(--pf-global--FontWeight--bold);
left: 50%;
margin-right: -50%;
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</script>
</head>

<body>
<body class="pf-m-redhat-font">
<noscript>JavaScript must be enabled.</noscript>
<div id="modal-container"></div>
[[ if .GoogleTagManagerID ]]
Expand Down
9 changes: 2 additions & 7 deletions frontend/public/style/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ $co-external-link-padding-right: 15px;

.co-m-pane__heading {
display: flex;
font-size: 22px;
justify-content: space-between;
margin: 0 0 $grid-gutter-width;
&--baseline {
Expand All @@ -106,15 +105,14 @@ $co-external-link-padding-right: 15px;

.co-m-pane__heading-link {
font-size: $font-size-base;
font-weight: normal;
}

.co-inline-block {
display: inline-block;
}

.co-no-bold {
font-weight: normal;
font-weight: var(--pf-global--FontWeight--normal);
}

.cos-error-title {
Expand All @@ -123,7 +121,6 @@ $co-external-link-padding-right: 15px;

.co-section-heading {
display: flex;
font-size: 20px;
justify-content: space-between;
margin: 0 0 20px 0;
}
Expand All @@ -139,13 +136,11 @@ $co-external-link-padding-right: 15px;

.co-section-heading-secondary {
font-size: 16px;
font-weight: 600;
margin: 30px 0;
}

.co-section-heading-tertiary {
font-size: 16px;
font-weight: 600;
margin: 15px 0;
}

Expand Down Expand Up @@ -376,7 +371,7 @@ $co-external-link-padding-right: 15px;

.co-legend {
border-bottom: 0;
font-weight: 600;
font-weight: var(--pf-global--FontWeight--bold);
font-size: $font-size-base;
margin-bottom: 5px;

Expand Down
2 changes: 1 addition & 1 deletion frontend/public/style/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body,
}

&__sidebar-heading {
font-size: 18px;
font-size: 17px;
margin-bottom: 20px;
margin-top: 45px;
}
Expand Down
14 changes: 14 additions & 0 deletions frontend/public/style/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,19 @@ kbd {

// PatternFly 4 overrides

h1,
h2,
h3,
h4,
h5,
h6 {
// reset headings font family back to correct value
// bug caused by PF4 _shield-inheritable.scss
.pf-l-split {
font-family: $headings-font-family;
}
}

.pf-c-about-modal-box {
&__brand {
align-items: flex-start; // so logos don't stretch vertically
Expand Down Expand Up @@ -98,6 +111,7 @@ kbd {
padding-top: 0 !important;
}
&__group-title {
font-family: $font-family-base;
padding-top: 8px !important;
}
}
Expand Down
Loading