Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit c2b98c3

Browse files
Merge pull request #772 from deckgo/studio-google-font-open-sans
studio: use Google Font "Open Sans" for the editor
2 parents 04d0e38 + 91d30aa commit c2b98c3

File tree

11 files changed

+29
-13
lines changed

11 files changed

+29
-13
lines changed

studio/src/app/components/core/app-footer/app-footer.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ app-footer {
3232
padding-bottom: 6px;
3333

3434
color: black;
35-
font-weight: bold;
35+
font-weight: 700;
3636
}
3737

3838
ion-router-link {

studio/src/app/components/core/app-user-info/app-user-info.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ app-user-info {
2727

2828
ion-label:first-of-type {
2929
padding-bottom: 4px;
30-
font-weight: 500;
30+
font-weight: 400;
3131
font-size: var(--font-size-normal);
3232

3333
width: 100%;

studio/src/app/components/editor/app-slot-type/app-slot-type.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ app-slot-type {
1515
ion-item {
1616
h1,
1717
h2 {
18-
font-weight: 500;
18+
font-weight: 400;
1919
}
2020

2121
h3 {

studio/src/app/components/editor/styles/deck/app-deck-fonts/app-deck-fonts.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ app-deck-fonts {
3636
p[slot="title"] {
3737
margin: 0;
3838
font-weight: normal;
39+
40+
&.default {
41+
font-family: var(--font-family-default);
42+
}
3943
}
4044
}
4145
}

studio/src/app/components/editor/styles/deck/app-deck-fonts/app-deck-fonts.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ export class AppDeckFonts {
100100
return (
101101
<div class={`item ${selected ? 'selected' : ''}`} custom-tappable onClick={() => this.selectFont(null)}>
102102
<deckgo-slide-title class="showcase">
103-
<p slot="title">Default</p>
103+
<p slot="title" class="default">
104+
Default
105+
</p>
104106
</deckgo-slide-title>
105107
</div>
106108
);

studio/src/app/components/landing/app-landing-deck/app-landing-deck.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ app-landing-deck {
33
--deckgo-highlight-code-font-size: 125%;
44

55
h1 {
6-
font-weight: 600;
6+
font-weight: 700;
77
margin-bottom: 0;
88
}
99

1010
h2,
1111
h3 {
12-
font-weight: 500;
12+
font-weight: 400;
1313
}
1414

1515
h1,

studio/src/app/popovers/editor/app-create-slide/app-create-slide.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ app-create-slide {
272272

273273
width: 86%;
274274

275-
font-weight: 500;
275+
font-weight: 400;
276276
}
277277
}
278278

studio/src/global/theme/editor/editor-deck.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ deckgo-deck {
66
--pager-text-slides-display: block;
77
--pager-text-color: black;
88

9+
font-family: var(--font-family-default);
10+
911
h1,
1012
h2,
1113
h3,

studio/src/global/theme/fonts.scss

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
:root {
2-
--ion-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
2+
font-family: "Open Sans", sans-serif;
3+
--ion-font-family: "Open Sans", sans-serif;
4+
5+
--font-family-default: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
6+
37
text-rendering: optimizeLegibility;
48
-webkit-font-smoothing: antialiased;
59

@@ -15,19 +19,19 @@
1519
h1,
1620
h1 a {
1721
font-size: var(--font-size-h1);
18-
font-weight: bold;
22+
font-weight: 700;
1923
}
2024

2125
h2,
2226
h2 a {
2327
font-size: var(--font-size-h2);
24-
font-weight: bold;
28+
font-weight: 700;
2529
}
2630

2731
h3,
2832
h3 a {
2933
font-size: var(--font-size-h3);
30-
font-weight: bold;
34+
font-weight: 700;
3135
}
3236

3337
h4,
@@ -52,7 +56,7 @@ ion-router-link,
5256
text-decoration: none;
5357
transition: border 0.3s;
5458
border-bottom: 1px solid transparent;
55-
font-weight: 500;
59+
font-weight: 400;
5660
}
5761

5862
p a:hover,

studio/src/global/theme/menu.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ion-menu {
2828
--background: transparent;
2929

3030
--color: var(--ion-color-medium);
31-
font-weight: bold;
31+
font-weight: 700;
3232

3333
&:not(:first-of-type) {
3434
margin-top: 8px;

0 commit comments

Comments
 (0)