Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita5349e4

Browse files
Dan font update (#1411)
1 parentfd613cb commita5349e4

File tree

9 files changed

+36
-11
lines changed

9 files changed

+36
-11
lines changed

‎pgml-dashboard/src/components/navigation/left_nav/web_app/template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<% use crate::components::{LeftNavMenu, Dropdown}; %>
3-
<divclass="leftnav-container py-3"data-controller="navigation-left-nav-web-app">
3+
<divclass="leftnav-container py-3 font-family-primary"data-controller="navigation-left-nav-web-app">
44
<navclass="leftnav nav-pills h-100"data-controller="extend-bs-collapse"data-extend-bs-collapse-affected-value=".leftnav-collapse-affect">
55
<divclass="d-flex flex-column justify-content-between h-100 menu-container leftnav-collapse-affect expanded">
66
<divclass="d-flex flex-column">

‎pgml-dashboard/src/components/navigation/navbar/web_app/template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use crate::components::{Dropdown, ProfileIcon};
55
%>
66

7-
<divclass="fixed-top-nav"data-controller="navigation-navbar-web-app">
7+
<divclass="fixed-top-nav font-family-primary"data-controller="navigation-navbar-web-app">
88
<navclass="navbar-web-app horizontal navbar-expand-lg"data-controller="search topnav-web-app">
99

1010
<divclass="controls">

‎pgml-dashboard/static/css/scss/base/_base.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ html, body, main {
6666
}
6767

6868
article {
69-
font-family:"Roboto",Helvetica;
70-
7169
p {
7270
line-height:1.6rem;
7371
print-color-adjust:exact;

‎pgml-dashboard/static/css/scss/base/_font.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
$font-family-base:'silka','Roboto','sans-serif';
2-
31
@font-face {
42
font-family:'silka';
53
src:url('/dashboard/static/fonts/silka-bold-webfont.eot');

‎pgml-dashboard/static/css/scss/base/_typography.scss

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,102 @@
11
// all other displays are default bootstrap styling
22
.display-2 {
3+
font-family:var(--font-family-primary);
34
font-weight:$font-weight-bold;
45
font-size:4rem;
56
line-height:80px;
67
}
78

89
.h1-big {
10+
font-family:var(--font-family-primary);
911
font-weight:$font-weight-bold;font-size:var(--h1-big-font-size);line-height:var(--h1-big-line-height);
1012
@includemedia-breakpoint-down(md) {
1113
font-size:48px;line-height:52px;
1214
}
1315
}
1416
h1,.h1 {
17+
font-family:var(--font-family-primary);
1518
font-weight:$font-weight-bold;font-size:var(--h1-font-size);line-height:var(--h1-line-height);
1619
@includemedia-breakpoint-down(md) {
1720
font-size:$h1-font-size;line-height:48px;
1821
}
1922
}
2023
h2,.h2 {
24+
font-family:var(--font-family-primary);
2125
font-weight:$font-weight-bold;font-size:var(--h2-font-size);line-height:var(--h2-line-height);
2226
@includemedia-breakpoint-down(md) {
2327
font-size:40px;line-height:44px;
2428
}
2529
}
2630
h3,.h3 {
31+
font-family:var(--font-family-primary);
2732
font-weight:$font-weight-bold;font-size:var(--h3-font-size);line-height:var(--h3-line-height);
2833
@includemedia-breakpoint-down(md) {
2934
font-size:32px;line-height:36px;
3035
}
3136
}
3237
h4,.h4 {
38+
font-family:var(--font-family-primary);
3339
font-weight:$font-weight-bold;font-size:var(--h4-font-size);line-height:var(--h4-line-height);
3440
@includemedia-breakpoint-down(md) {
3541
font-size:28px;line-height:32px;
3642
}
3743
}
3844
h5,.h5 {
45+
font-family:var(--font-family-primary);
3946
font-weight:$font-weight-bold;font-size:var(--h5-font-size);line-height:var(--h5-line-height);
4047
@includemedia-breakpoint-down(md) {
4148
font-size:24px;line-height:28px;
4249
}
4350
}
4451
h6,.h6 {
52+
font-family:var(--font-family-primary);
4553
font-weight:$font-weight-bold;font-size:var(--h6-font-size);line-height:var(--h6-line-height);
4654
@includemedia-breakpoint-down(md) {
4755
font-size:20px;line-height:26px;
4856
}
4957
}
5058

5159
.eyebrow-text {
60+
font-family:var(--font-family-primary);
5261
font-weight:$font-weight-bold;font-size:var(--eyebrow-font-size);line-height:var(--eyebrow-line-height);
5362
@includemedia-breakpoint-down(md) {
5463
font-size:16px;line-height:22px;
5564
}
5665
}
5766

5867
.subcopy-text {
59-
font-family:'inter',sans-serif;
68+
font-family:var(--font-family-secondary);
6069
font-size:18px;
6170
line-height:22px;
6271
}
6372

6473
.body-large-text {
74+
font-family:var(--font-family-secondary);
6575
font-size:var(--body-large-font-size);line-height:var(--body-large-line-height);
6676
@includemedia-breakpoint-down(md) {
6777
font-size:18px;line-height:24px;
6878
}
6979
}
7080

71-
// default body text size
72-
.body-regular-text,p {
81+
// default body text
82+
.body-regular-text,p,body {
83+
font-family:var(--font-family-secondary);
7384
font-size:var(--body-regular-font-size);line-height:var(--body-regular-line-height);
7485
@includemedia-breakpoint-down(md) {
7586
font-size:16px;line-height:20px;
7687
}
7788
}
7889

7990
.body-small-text {
91+
font-family:var(--font-family-secondary);
8092
font-size:var(--body-small-font-size);line-height:var(--body-small-line-height);
8193
@includemedia-breakpoint-down(md) {
8294
font-size:14px;line-height:18px;
8395
}
8496
}
8597

8698
.legal-text {
87-
font-family:Inter;
99+
font-family:var(--font-family-secondary);
88100
font-size:var(--legal-font-size);
89101
line-height:var(--legal-line-height);
90102
@includemedia-breakpoint-down(md) {
@@ -110,7 +122,6 @@ h6, .h6 {
110122
.text-white,.text-white-100 {
111123
color:#{$gray-100}!important;
112124
}
113-
114125
.text-purple {
115126
color:#{$purple}!important;
116127
}
@@ -140,3 +151,11 @@ h6, .h6 {
140151
.text-gradient-party,.party-time {
141152
@includetext-gradient($gradient-text);
142153
}
154+
155+
.font-family-primary {
156+
font-family:var(--font-family-primary)!important;
157+
}
158+
159+
.font-family-secondary {
160+
font-family:var(--font-family-secondary)!important;
161+
}

‎pgml-dashboard/static/css/scss/components/_buttons.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.btn {
22
font-weight:$font-weight-semibold;
3+
font-family:var(--font-family-primary);
34

45
display:flex;
56
justify-content:center;

‎pgml-dashboard/static/css/scss/themes/docs.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@
2424
--body-large-line-height:26px;
2525
--body-regular-line-height:22px;
2626
--body-small-line-height:20px;
27+
28+
--font-family-primary:'silka','Roboto','sans-serif';
29+
--font-family-secondary:'inter','sans-serif';
2730
}

‎pgml-dashboard/static/css/scss/themes/marketing.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@
2525
--body-large-line-height:26px;
2626
--body-regular-line-height:22px;
2727
--body-small-line-height:20px;
28+
29+
--font-family-primary:'silka','Roboto','sans-serif';
30+
--font-family-secondary:'inter','sans-serif';
2831
}

‎pgml-dashboard/static/css/scss/themes/product.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@
2424
--body-large-line-height:24px;
2525
--body-regular-line-height:20px;
2626
--body-small-line-height:18px;
27+
28+
--font-family-primary:'silka','Roboto','sans-serif';
29+
--font-family-secondary:'inter','sans-serif';
2730
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp