Project

General

Profile

« Previous | Next » 

Revision af5803ad

Added by Avi Sharvit almost 4 years ago

Fixes #29331 - use patternfly v4 fonts

View differences:

app/assets/stylesheets/base-pf4.scss
/*
This file exists to make pf3 compatible with pf4.
When migrating from pf3 to pf4, some styles might be removable.
*/
/*
Basic fonts and colors overrides
*/
html {
font-family: sans-serif;
line-height: 1.15;
}
body {
font-family: var(--pf-global--FontFamily--sans-serif);
font-size: var(--pf-global--FontSize--sm);
font-weight: var(--pf-global--FontWeight--normal);
line-height: var(--pf-global--LineHeight--md);
text-align: left;
background-color: var(--pf-global--BackgroundColor--100);
}
a {
font-weight: var(--pf-global--link--FontWeight);
color: var(--pf-global--link--Color);
text-decoration: var(--pf-global--link--TextDecoration);
&:hover {
--pf-global--link--Color: var(--pf-global--link--Color--hover);
--pf-global--link--TextDecoration: var(--pf-global--link--TextDecoration--hover);
}
}
/*
PF3-Tables overrides
*/
.table {
& > thead,
& > tbody,
& > tfoot {
& > tr {
// fix line-height to be compatible with pf4 fonts
& > th,
& > td {
line-height: inherit;
}
// fix headers to be bold
& > th a {
font-weight: 600;
}
}
}
}
/*
PF3-VerticalNavigation overrides
*/
.navbar-pf-vertical {
ul.navbar-iconic {
.nav-item-iconic {
font-size: 15px;
&#account_menu {
font-size: 12px;
}
}
.notification-dropdown > div {
line-height: 18px;
}
}
}
.nav-pf-vertical {
.secondary-nav-item-pf {
span.list-group-item-value {
font-size: 15px;
line-height: inherit;
}
.nav-pf-secondary-nav {
.nav-item-pf-header {
font-size: 17px;
}
.vertical-sub-header-pf {
font-size: 14px;
font-weight: 900;
}
span.list-group-item-value {
font-size: 12px;
}
}
}
}
app/assets/stylesheets/base.scss
}
}
// fix pf3 tables to have bold headers
// when mixing with pf4 styles
.table {
& > thead,
& > tbody,
& > tfoot {
& > tr > th a {
font-weight: 600;
}
}
}
.base li {
list-style: none;
margin-left: 20px;
app/assets/stylesheets/navigation.scss
text-transform: uppercase;
font-weight: bold;
font-size: 20px;
font-family: "Open Sans", Helvetica, Arial, sans-serif;
}
}
}
app/assets/stylesheets/typography.scss
@font-face {
font-family: 'Overpass';
src: local("Overpass"), font-url('overpass_regular-web.woff') format("woff");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Overpass';
src:
local("Overpass Bold"),
local("OverpassBold"),
font-url('overpass_bold-web.woff') format("woff");
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'AllBullets';
src: local("AllBullets"), font-url('AllBullets.woff') format("woff");
app/controllers/application_controller.rb
end
def allow_webpack
webpack_csp = { script_src: [webpack_server], connect_src: [webpack_server],
style_src: [webpack_server], img_src: [webpack_server], default_src: [webpack_server] }
webpack_csp = {
script_src: [webpack_server], connect_src: [webpack_server],
style_src: [webpack_server], img_src: [webpack_server],
font_src: ["data: #{webpack_server}"], default_src: [webpack_server]
}
append_content_security_policy_directives(webpack_csp)
end
app/views/dashboard/_new_hosts_widget_host_list.html.erb
<table class="table table-striped table-fixed">
<thead>
<th width="30%"><%= _('Host') %></th>
<th><%= _('Operating System') %></th>
<th width="150px"><%= _('Operating System') %></th>
<th><%= _('Owner') %></th>
<th><%= _('Created') %></th>
<th><%= _('Installed') %></th>
app/views/hosts/_list.html.erb
<tr>
<th class="ca" width="40px"><%= check_box_tag "check_all", "", false, { :onchange => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items on this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
<% if power_status_visible? %>
<th class="ca" width="5%"><%= _('Power') %></th>
<th class="ca" width="80px"><%= _('Power') %></th>
<% end %>
<th width="25%"><%= sort :name, :as => _('Name') %></th>
<th class="hidden-xs" width="17%"><%= sort :os_title, :as => _("Operating system") %></th>
app/views/layouts/base.html.erb
<%= yield(:head) %>
</head>
<body>
<body class="pf-m-redhat-font">
<!--[if lte IE 9]>
<%= _('You are using an unsupported browser.') %>
<![endif]-->

Also available in: Unified diff