Content-Length: 544717 | pFad | http://github.com/postgresml/postgresml/pull/1411/files

42 Dan font update by chillenberger · Pull Request #1411 · postgresml/postgresml · GitHub
Skip to content

Dan font update #1411

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
merged 2 commits into from
Apr 19, 2024
Merged

Dan font update #1411

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
0445909
update fonts on entire site
chillenberger Apr 19, 2024
7a39ef7
remove article font family, make all btns silka font
chillenberger Apr 19, 2024
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
2 changes: 1 addition & 1 deletion pgml-dashboard/src/components/navigation/left_nav/web_app/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<% use crate::components::{LeftNavMenu, Dropdown}; %>
<div class="leftnav-container py-3" data-controller="navigation-left-nav-web-app">
<div class="leftnav-container py-3 font-family-primary" data-controller="navigation-left-nav-web-app">
<nav class="leftnav nav-pills h-100" data-controller="extend-bs-collapse" data-extend-bs-collapse-affected-value=".leftnav-collapse-affect">
<div class="d-flex flex-column justify-content-between h-100 menu-container leftnav-collapse-affect expanded">
<div class="d-flex flex-column">
Expand Down
2 changes: 1 addition & 1 deletion pgml-dashboard/src/components/navigation/navbar/web_app/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use crate::components::{Dropdown, ProfileIcon};
%>

<div class="fixed-top-nav" data-controller="navigation-navbar-web-app">
<div class="fixed-top-nav font-family-primary" data-controller="navigation-navbar-web-app">
<nav class="navbar-web-app horizontal navbar-expand-lg" data-controller="search topnav-web-app">

<div class="controls">
Expand Down
2 changes: 0 additions & 2 deletions pgml-dashboard/static/css/scss/base/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ html, body, main {
}

article {
font-family: "Roboto", Helvetica;

p {
line-height: 1.6rem;
print-color-adjust: exact;
Expand Down
2 changes: 0 additions & 2 deletions pgml-dashboard/static/css/scss/base/_font.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
$font-family-base: 'silka', 'Roboto', 'sans-serif';

@font-face {
font-family: 'silka';
src: url('/dashboard/static/fonts/silka-bold-webfont.eot');
Expand Down
29 changes: 24 additions & 5 deletions pgml-dashboard/static/css/scss/base/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,102 @@
// all other displays are default bootstrap styling
.display-2 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold;
font-size: 4rem;
line-height: 80px;
}

.h1-big {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h1-big-font-size); line-height: var(--h1-big-line-height);
@include media-breakpoint-down(md) {
font-size: 48px; line-height: 52px;
}
}
h1, .h1 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h1-font-size); line-height: var(--h1-line-height);
@include media-breakpoint-down(md) {
font-size: $h1-font-size; line-height: 48px;
}
}
h2, .h2 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h2-font-size); line-height: var(--h2-line-height);
@include media-breakpoint-down(md) {
font-size: 40px; line-height: 44px;
}
}
h3, .h3 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h3-font-size); line-height: var(--h3-line-height);
@include media-breakpoint-down(md) {
font-size: 32px; line-height: 36px;
}
}
h4, .h4 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h4-font-size); line-height: var(--h4-line-height);
@include media-breakpoint-down(md) {
font-size: 28px; line-height: 32px;
}
}
h5, .h5 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h5-font-size); line-height: var(--h5-line-height);
@include media-breakpoint-down(md) {
font-size: 24px; line-height: 28px;
}
}
h6, .h6 {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--h6-font-size); line-height: var(--h6-line-height);
@include media-breakpoint-down(md) {
font-size: 20px; line-height: 26px;
}
}

.eyebrow-text {
font-family: var(--font-family-primary);
font-weight: $font-weight-bold; font-size: var(--eyebrow-font-size); line-height: var(--eyebrow-line-height);
@include media-breakpoint-down(md) {
font-size: 16px; line-height: 22px;
}
}

.subcopy-text {
font-family: 'inter', sans-serif;
font-family: var(--font-family-secondary);
font-size: 18px;
line-height: 22px;
}

.body-large-text {
font-family: var(--font-family-secondary);
font-size: var(--body-large-font-size); line-height: var(--body-large-line-height);
@include media-breakpoint-down(md) {
font-size: 18px; line-height: 24px;
}
}

// default body text size
.body-regular-text, p {
// default body text
.body-regular-text, p, body {
font-family: var(--font-family-secondary);
font-size: var(--body-regular-font-size); line-height: var(--body-regular-line-height);
@include media-breakpoint-down(md) {
font-size: 16px; line-height: 20px;
}
}

.body-small-text {
font-family: var(--font-family-secondary);
font-size: var(--body-small-font-size); line-height: var(--body-small-line-height);
@include media-breakpoint-down(md) {
font-size: 14px; line-height: 18px;
}
}

.legal-text {
font-family: Inter;
font-family: var(--font-family-secondary);
font-size: var(--legal-font-size);
line-height: var(--legal-line-height);
@include media-breakpoint-down(md) {
Expand All @@ -110,7 +122,6 @@ h6, .h6 {
.text-white, .text-white-100 {
color: #{$gray-100} !important;
}

.text-purple {
color: #{$purple} !important;
}
Expand Down Expand Up @@ -140,3 +151,11 @@ h6, .h6 {
.text-gradient-party, .party-time {
@include text-gradient($gradient-text);
}

.font-family-primary {
font-family: var(--font-family-primary) !important;
}

.font-family-secondary {
font-family: var(--font-family-secondary) !important;
}
1 change: 1 addition & 0 deletions pgml-dashboard/static/css/scss/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.btn {
font-weight: $font-weight-semibold;
font-family: var(--font-family-primary);

display: flex;
justify-content: center;
Expand Down
3 changes: 3 additions & 0 deletions pgml-dashboard/static/css/scss/themes/docs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,7 @@
--body-large-line-height: 26px;
--body-regular-line-height: 22px;
--body-small-line-height: 20px;

--font-family-primary: 'silka', 'Roboto', 'sans-serif';
--font-family-secondary: 'inter', 'sans-serif';
}
3 changes: 3 additions & 0 deletions pgml-dashboard/static/css/scss/themes/marketing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@
--body-large-line-height: 26px;
--body-regular-line-height: 22px;
--body-small-line-height: 20px;

--font-family-primary: 'silka', 'Roboto', 'sans-serif';
--font-family-secondary: 'inter', 'sans-serif';
}
3 changes: 3 additions & 0 deletions pgml-dashboard/static/css/scss/themes/product.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,7 @@
--body-large-line-height: 24px;
--body-regular-line-height: 20px;
--body-small-line-height: 18px;

--font-family-primary: 'silka', 'Roboto', 'sans-serif';
--font-family-secondary: 'inter', 'sans-serif';
}








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/postgresml/postgresml/pull/1411/files

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy