Skip to content

Commit

Permalink
chore(fonts): replace SourceSansPro font with Ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuri committed Jun 9, 2018
1 parent 8ad2dbc commit efbc7bb
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 29 deletions.
Binary file removed src/assets/fonts/SourceSansPro-Black.ttf
Binary file not shown.
Binary file removed src/assets/fonts/SourceSansPro-Bold.ttf
Binary file not shown.
Binary file removed src/assets/fonts/SourceSansPro-ExtraLight.ttf
Binary file not shown.
Binary file removed src/assets/fonts/SourceSansPro-Light.ttf
Binary file not shown.
Binary file removed src/assets/fonts/SourceSansPro-Regular.ttf
Binary file not shown.
Binary file removed src/assets/fonts/SourceSansPro-SemiBold.ttf
Binary file not shown.
Binary file added src/assets/fonts/Ubuntu-Bold.ttf
Binary file not shown.
Binary file added src/assets/fonts/Ubuntu-Light.ttf
Binary file not shown.
Binary file added src/assets/fonts/Ubuntu-Medium.ttf
Binary file not shown.
Binary file added src/assets/fonts/Ubuntu-Regular.ttf
Binary file not shown.
6 changes: 3 additions & 3 deletions src/styles/build-details.sass
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@
margin-left: 10px

.span-debug
font-family: $font-family-semibold
font-family: $font-family-medium
color: $color-secondary !important

.span-ssh
color: $black !important
font-family: $font-family-semibold
font-family: $font-family-medium

.ssh-container
display: flex
Expand All @@ -129,7 +129,7 @@
.debug
line-height: 0.7
max-width: 120px
font-family: $font-family-semibold
font-family: $font-family-medium
color: $black
font-size: 12px

Expand Down
16 changes: 8 additions & 8 deletions src/styles/content.sass
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
color: $color
font-size: 20px
padding: 20px 20px 0 20px
font-family: $font-family-semibold
font-family: $font-family-medium

h3
color: $color-secondary
padding: 20px 20px 10px 20px
font-size: 14px
text-transform: uppercase
font-family: $font-family-semibold
font-family: $font-family-medium

h4
text-transform: uppercase
font-size: 12px
font-family: $font-family-semibold
font-family: $font-family-medium
color: $color-secondary
padding: 20px 0 0 0

Expand All @@ -50,11 +50,11 @@
text-decoration: underline

&.bold
font-family: $font-family-semibold
font-family: $font-family-medium

&.larger
font-size: 15px
font-family: $font-family-semibold
font-family: $font-family-medium

+mobile
padding: 5px 0
Expand Down Expand Up @@ -108,7 +108,7 @@
border: 1px solid $divider
display: flex
align-items: center
font-family: $font-family-semibold
font-family: $font-family-medium

+mobile
display: block
Expand Down Expand Up @@ -204,7 +204,7 @@

span
font-size: 16px
font-family: $font-family-semibold
font-family: $font-family-medium

+mobile
text-align: center
Expand Down Expand Up @@ -284,7 +284,7 @@
text-decoration: underline

&.bold
font-family: $font-family-semibold
font-family: $font-family-medium

.icon-and-text
display: inline-flex
Expand Down
20 changes: 8 additions & 12 deletions src/styles/fonts.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
font-weight: $weight
font-style: $style

+font-face('SourceSansPro-Thin', '/assets/fonts/SourceSansPro-ExtraLight', 200, 'normal')
+font-face('SourceSansPro-Light', '/assets/fonts/SourceSansPro-Light', 300, 'normal')
+font-face('SourceSansPro-Regular', '/assets/fonts/SourceSansPro-Regular', 400, 'normal')
+font-face('SourceSansPro-SemiBold', '/assets/fonts/SourceSansPro-SemiBold', 600, 'normal')
+font-face('SourceSansPro-Bold', '/assets/fonts/SourceSansPro-Bold', 700, 'normal')
+font-face('SourceSansPro-Extrabold', '/assets/fonts/SourceSansPro-ExtraBold', 900, 'normal')
+font-face('Ubuntu-Light', '/assets/fonts/Ubuntu-Light', 300, 'normal')
+font-face('Ubuntu-Regular', '/assets/fonts/Ubuntu-Regular', 400, 'normal')
+font-face('Ubuntu-Medium', '/assets/fonts/Ubuntu-SemiBold', 500, 'normal')
+font-face('Ubuntu-Bold', '/assets/fonts/Ubuntu-Bold', 700, 'normal')

$font-family-thin: 'SourceSansPro-ExtraLight', sans-serif
$font-family-light: 'SourceSansPro-Light', sans-serif
$font-family-regular: 'SourceSansPro-Regular', sans-serif
$font-family-semibold: 'SourceSansPro-SemiBold', sans-serif
$font-family-bold: 'SourceSansPro-Bold', sans-serif
$font-family-black: 'SourceSansPro-Black', sans-serif
$font-family-light: 'Ubuntu-Light', sans-serif
$font-family-regular: 'Ubuntu-Regular', sans-serif
$font-family-medium: 'Ubuntu-medium', sans-serif
$font-family-bold: 'Ubuntu-Bold', sans-serif
2 changes: 1 addition & 1 deletion src/styles/forms.sass
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
font-size: 14px
display: block
padding: 5px 0
font-family: $font-family-semibold
font-family: $font-family-medium

&.is-for-toggle
float: left
Expand Down
2 changes: 1 addition & 1 deletion src/styles/job.sass
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
color: $white
height: 100%
color: $yellow
font-family: $font-family-semibold
font-family: $font-family-medium

.icon
margin-right: 20px
Expand Down
2 changes: 1 addition & 1 deletion src/styles/labels.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
color: $color
border-radius: 4px
font-size: 12px
font-family: $font-family-semibold
font-family: $font-family-medium
width: 100%
display: flex
align-items: center
Expand Down
3 changes: 1 addition & 2 deletions src/styles/nav.sass
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
.header-left

.header-item
font-weight: 700
font-size: 13px
margin-right: 20px
font-family: $font-family-bold
Expand Down Expand Up @@ -154,7 +153,7 @@
h1
font-size: 16px
font-family: $font-family-bold
color: $color-secondary
color: $color

.nav-item
display: inline-flex
Expand Down
2 changes: 1 addition & 1 deletion src/styles/setup.sass
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
padding: 10px 10px 10px 10px
text-transform: uppercase
color: $color-secondary
font-family: $font-family-semibold
font-family: $font-family-medium

img
width: 14px
Expand Down

0 comments on commit efbc7bb

Please sign in to comment.