Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 studio/src/app/components/core/app-footer/app-footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ app-footer {
padding-bottom: 6px;

color: black;
font-weight: bold;
font-weight: 700;
}

ion-router-link {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ app-user-info {

ion-label:first-of-type {
padding-bottom: 4px;
font-weight: 500;
font-weight: 400;
font-size: var(--font-size-normal);

width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ app-slot-type {
ion-item {
h1,
h2 {
font-weight: 500;
font-weight: 400;
}

h3 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ app-deck-fonts {
p[slot="title"] {
margin: 0;
font-weight: normal;

&.default {
font-family: var(--font-family-default);
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ export class AppDeckFonts {
return (
<div class={`item ${selected ? 'selected' : ''}`} custom-tappable onClick={() => this.selectFont(null)}>
<deckgo-slide-title class="showcase">
<p slot="title">Default</p>
<p slot="title" class="default">
Default
</p>
</deckgo-slide-title>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ app-landing-deck {
--deckgo-highlight-code-font-size: 125%;

h1 {
font-weight: 600;
font-weight: 700;
margin-bottom: 0;
}

h2,
h3 {
font-weight: 500;
font-weight: 400;
}

h1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ app-create-slide {

width: 86%;

font-weight: 500;
font-weight: 400;
}
}

Expand Down
2 changes: 2 additions & 0 deletions studio/src/global/theme/editor/editor-deck.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ deckgo-deck {
--pager-text-slides-display: block;
--pager-text-color: black;

font-family: var(--font-family-default);

h1,
h2,
h3,
Expand Down
14 changes: 9 additions & 5 deletions studio/src/global/theme/fonts.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
:root {
--ion-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-family: "Open Sans", sans-serif;
--ion-font-family: "Open Sans", sans-serif;

--font-family-default: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";

text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;

Expand All @@ -15,19 +19,19 @@
h1,
h1 a {
font-size: var(--font-size-h1);
font-weight: bold;
font-weight: 700;
}

h2,
h2 a {
font-size: var(--font-size-h2);
font-weight: bold;
font-weight: 700;
}

h3,
h3 a {
font-size: var(--font-size-h3);
font-weight: bold;
font-weight: 700;
}

h4,
Expand All @@ -52,7 +56,7 @@ ion-router-link,
text-decoration: none;
transition: border 0.3s;
border-bottom: 1px solid transparent;
font-weight: 500;
font-weight: 400;
}

p a:hover,
Expand Down
2 changes: 1 addition & 1 deletion studio/src/global/theme/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ion-menu {
--background: transparent;

--color: var(--ion-color-medium);
font-weight: bold;
font-weight: 700;

&:not(:first-of-type) {
margin-top: 8px;
Expand Down
4 changes: 4 additions & 0 deletions studio/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@

<link rel="manifest" href="/manifest.json" />

<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin />

<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,700;1,300&display=swap" rel="stylesheet" />

<style>
:root {
background: #f4f5f8;
Expand Down