Skip to content
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.

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

[DONE] TH-656: Replace Gotham Rounded with Quicksand font #48

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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 TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Let's utilize a mobile-first approach and have mobile be the default. The rest o

Typography
---
We utilize Gotham Rounded for all of our web typography. Maybe we should include a download of it for people to use while prototyping?
We utilize Quicksand for all of our web typography. Maybe we should include a download of it for people to use while prototyping?

#### Headers and Sizing
We can provide styling for default `<h1> - <h6>`, as well as, utility classes for applying different sizes to the default elements so that we can control markup hierarchy while still applying the sizes we want visually.
Expand Down
5 changes: 3 additions & 2 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<link rel="icon" href="favicon.ico" type="image/x-icon">
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="preconnect" href="https://cdn.fonts.net">
<link href="https://cdn.fonts.net/kit/39d0ab8f-c2d6-48ee-8a04-732fec352d95/39d0ab8f-c2d6-48ee-8a04-732fec352d95.css" rel="stylesheet" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Quicksand:[email protected]&display=swap" rel="stylesheet">
<link rel="stylesheet" href="{{ site.baseurl }}/css/styleguide.css">
</head>
4 changes: 2 additions & 2 deletions _sass/leap/_global.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ html

body
font-size: 1rem
font-family: $gotham
font-family: $quicksand
font-style: normal
font-weight: 400
font-weight: $normal
14 changes: 10 additions & 4 deletions _sass/leap/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,16 @@ $text-size: (
6: 0.875rem
);

$gotham: "GothamRoundedMedium", "Helvetica", Helvetica, Arial, sans-serif;
$bold: 500;


// Fonts
$sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
$quicksand: "Quicksand", $sans-serif;

// Font Weights
$light: 300;
$normal: 400;
$medium: 500;
$semibold: 600;
$bold: 700;

// Global Border Variables
$border-color-dark: #b7c0c7;
Expand Down
2 changes: 1 addition & 1 deletion _sass/leap/atoms/_button.sass
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
color: brand-color(green)
cursor: pointer
display: inline-block
font-family: $gotham
font-family: $quicksand
font-size: text-size(5)
font-weight: $bold
height: 40px
Expand Down
12 changes: 6 additions & 6 deletions _sass/leap/atoms/_forms.sass
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $form-states: success, warning, error
// Helper Text
&-helper
color: text-color(light)
font-weight: normal
font-weight: $normal
font-size: .9rem
margin-top: .5rem

Expand Down Expand Up @@ -166,7 +166,7 @@ $form-states: success, warning, error
z-index: -1
&+.form-label
display: block
font-weight: normal
font-weight: $normal
color: $form-color-inactive
padding: .25rem 0
margin-left: 25px !important
Expand Down Expand Up @@ -282,7 +282,7 @@ $form-states: success, warning, error
display: block
padding: 1em
margin-top: 0px
font-weight: 500
font-weight: $medium
border-bottom-left-radius: 4px
border-bottom-right-radius: 4px

Expand Down Expand Up @@ -322,7 +322,7 @@ $form-states: success, warning, error
position: relative
padding: 1em
margin-top: 0px
font-weight: 500
font-weight: $medium
border-radius: 4px
&:after
bottom: 100%
Expand Down Expand Up @@ -414,7 +414,7 @@ $form-states: success, warning, error
// Helper Text
&-helper
color: #fff
font-weight: normal
font-weight: $normal
font-size: .9rem
margin-top: .5rem

Expand Down Expand Up @@ -506,7 +506,7 @@ $form-states: success, warning, error
z-index: -1
&+.form-label
display: block
font-weight: normal
font-weight: $normal
color: #fff
padding: .25rem 0
margin-left: 25px !important
Expand Down
2 changes: 1 addition & 1 deletion _sass/leap/atoms/_table.sass
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ table
width: 100%
border-collapse: collapse
th
font-weight: 600
font-weight: $semibold
th,
td
text-align: left
Expand Down
2 changes: 1 addition & 1 deletion _sass/leap/atoms/_typography.sass
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ p
margin: 0

.regular
font-weight: normal !important
font-weight: $normal !important

strong,
.bold
Expand Down
4 changes: 2 additions & 2 deletions _sass/styleguide/_theme.sass
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,6 @@ body
&-link
font-size: text-size(6)
&:focus
font-weight: bold
font-weight: $bold
&--active
font-weight: bold
font-weight: $bold
34 changes: 17 additions & 17 deletions css/leap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/leap.min.css

Large diffs are not rendered by default.

Binary file removed fonts/490126/020AE7F52C3DBD3A9.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/084B91A2B74C7C053.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/0EB4F6E01C1B887FE.css

This file was deleted.

Binary file removed fonts/490126/113C79FB0CFB8746E.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/12AED559C7C6F4707.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/1B8C6C081C11F0350.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/1E9B15B140EBA8D4B.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/2416FBC5624BD5BEE.css

This file was deleted.

Binary file removed fonts/490126/32A530451A8E6E4E3.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/32A885C0EEACE1D60.css

This file was deleted.

Binary file removed fonts/490126/3C7BFEC3F06339E61.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/48451CFB813A01CED.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/5D45A1B194F1FAA74.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/5E91ED2EB2E75FC4C.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/6473AF59E13A9C16A.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/80DC696DAEC6B91E8.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/83CC0500D746370A7.css

This file was deleted.

Binary file removed fonts/490126/8C399091D111BE206.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/92B2A7E1124E2ECF4.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/92F0021BE9B6B9342.css

This file was deleted.

Binary file removed fonts/490126/9E2E496D0F1455795.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/9E403FCDDA0F1BAE3.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/AB417DADC99DFCBB9.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/B4FDB622C43644FE3.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/B669ECFD1934BB601.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/B77628BFA105F3282.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/B7FD1164BC31D2B2E.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/BA08EB0BC788E6378.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/BF3D87DD52F826E47.css

This file was deleted.

Binary file removed fonts/490126/C18ED533458E2A064.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/D421E29F5D9FE60C0.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/D58555D2800FE6567.css

This file was deleted.

Binary file removed fonts/490126/D8C8D42224BAD0264.eot
Binary file not shown.
19 changes: 0 additions & 19 deletions fonts/490126/E7924389C925C648E.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/EF7F1E11D99DAF856.css

This file was deleted.

19 changes: 0 additions & 19 deletions fonts/490126/F9928D0677F7CA72B.css

This file was deleted.

4 changes: 2 additions & 2 deletions sass.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ <h3 class="m-b-05-xs">Typography</h3>
<p class="bold">Font-family</p>
<div class="guide-code">
<pre class="m-tb-05-xs"><code class="language-css">.custom-element
font-family: $gotham
font-family: $quicksand
</code></pre>
<p class="m-b-2-xs"><code>$gotham</code></p>
<p class="m-b-2-xs"><code>$quicksand</code></p>

<p class="bold">Font-weight</p>
<div class="guide-code">
Expand Down