Skip to content

Commit

Permalink
feat(fonts): switch to SourceSansPro
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuri committed Dec 11, 2017
1 parent 66dbfaf commit 3e51103
Show file tree
Hide file tree
Showing 21 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "abstruse",
"version": "1.4.1",
"version": "1.4.2",
"description": "Abstruse CI",
"bin": {
"abstruse": "./dist/api/index.js"
Expand Down
Binary file removed src/app/assets/public/fonts/Montserrat-Black.ttf
Binary file not shown.
Binary file removed src/app/assets/public/fonts/Montserrat-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file removed src/app/assets/public/fonts/Montserrat-Light.ttf
Binary file not shown.
Binary file removed src/app/assets/public/fonts/Montserrat-Medium.ttf
Binary file not shown.
Binary file removed src/app/assets/public/fonts/Montserrat-SemiBold.ttf
Binary file not shown.
Binary file removed src/app/assets/public/fonts/Montserrat-Thin.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 7 additions & 2 deletions src/app/assets/public/images/abstruse-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container">
<div class="nav-left">
<span class="nav-item">
<h1 class="mr15 repository-h1">{{ repo?.full_name }}</h1>
<h1>{{ repo?.full_name }}</h1>
<span *ngIf="statusBadge" [innerHTML]="statusBadge | safeHtml" class="status-badge-repo"></span>
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/app/styles/buttons.sass
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
align-items: center
outline: none !important
flex: 1
font-weight: $weight-semibold
font-weight: $weight-bold
border-radius: 8px
background-image: linear-gradient(0deg, #F2F4F7 0%, #FFFFFF 100%)
border: 1px solid $border
Expand Down Expand Up @@ -217,7 +217,7 @@
border: 1px solid $header-background
color: $white
padding: 6px 12px
font-family: $font-family-semibold
font-family: $font-family-bold
font-weight: 700
text-transform: uppercase
font-size: 11px
Expand Down
5 changes: 3 additions & 2 deletions src/app/styles/colors.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$background: #fff
$background: #FAFBFC
$background-secondary: #222C3C
$background-button: #F1F5F7
$color: #354052
Expand All @@ -25,12 +25,13 @@ $grey-light: #adb5bd
$orange-secondary: #FD9A18
$grey-background: #E8EAF1
$grey-color: #8D909F
$dark: #4A4A4B

$button-background: #516173
$button-background-hover: #415061
$button-background-active: #354353

$header-background: #0d1011
$header-background: #F9FAFB
$header-background-dark: #404143
$header-context-background: #1798de

Expand Down
24 changes: 12 additions & 12 deletions src/app/styles/fonts.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
font-weight: $weight
font-style: $style

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

$font-family-thin: 'Montserrat-Thin', sans-serif
$font-family-light: 'Montserrat-Light', sans-serif
$font-family-regular: 'Montserrat-Medium', sans-serif
$font-family-semibold: 'Montserrat-SemiBold', sans-serif
$font-family-bold: 'Montserrat-Bold', sans-serif
$font-family-extrabold: 'Montserrat-ExtraBold', sans-serif
$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
13 changes: 6 additions & 7 deletions src/app/styles/nav.sass
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.header
width: 100%
height: 65px
height: 45px
background: $header-background
border-bottom: 1px solid $border
display: flex
Expand All @@ -23,16 +23,16 @@
font-weight: 700
font-size: 13px
margin-right: 20px
font-family: $font-family-semibold
color: $white
font-family: $font-family-bold
color: $dark

.header-right

.header-item
margin-left: 30px
font-weight: 700
font-size: 13px
font-family: $font-family-semibold
font-family: $font-family-bold
color: $white

.nav-item-icon
Expand All @@ -49,10 +49,9 @@
position: relative

.abstruse-logo
height: 20px
max-height: 25px
width: auto
margin-right: 20px
margin-top: -3px

.bell-icon
width: 20px
Expand Down Expand Up @@ -153,7 +152,7 @@

h1
font-size: 16px
font-family: $font-family-semibold
font-family: $font-family-bold
color: $color-secondary

.nav-item
Expand Down
2 changes: 1 addition & 1 deletion src/files/avatars/user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3e51103

Please sign in to comment.