Skip to content

Commit

Permalink
Use Cabin font, use google fonts, issue #9
Browse files Browse the repository at this point in the history
  • Loading branch information
daliborjanak committed Aug 6, 2017
1 parent c0b17d3 commit 3ba969c
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 34 deletions.
31 changes: 2 additions & 29 deletions _sass/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
/* Fonts */
@font-face {
font-family: 'OpenSans';
src: url('fonts/OpenSans-Regular.ttf');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('fonts/OpenSans-Italic.ttf');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('fonts/OpenSans-Bold.ttf');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'MuseoSans';
src: url('fonts/MuseoSans_700Web.eot');
}

@font-face {
font-family: 'MuseoSans';
src: url('fonts/MuseoSans_700Web.woff') format('woff');
}
@import url('https://fonts.googleapis.com/css?family=Cabin:500,700|Open+Sans:400,400i,700&subset=latin-ext');

@font-face {
font-family: 'icons';
Expand All @@ -49,4 +22,4 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 20px;
}
}
3 changes: 2 additions & 1 deletion _sass/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
.logo h1, .title{
float: left;
font-size: $navbar-top-title-size;
font-weight: $navbar-top-title-fontweight;
height: $navbar-top-height;
padding-top: $navbar-top-height - $navbar-top-title-size - $navbar-top-title-padding-bottom;
padding-right: $padding-x;
Expand Down Expand Up @@ -257,4 +258,4 @@ $scale: $navbar-top-small-height / $navbar-top-height;
white-space: nowrap;
}

}
}
9 changes: 5 additions & 4 deletions _sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ $link-color: $color-primary;
$link-hover-color: lighten($color-primary, 8%);

/* Fonts */
$font-primary: 'OpenSans', sans-serif, Arial;
$font-secondary: 'MuseoSans', 'OpenSans', sans-serif;
$font-primary: 'Open Sans', sans-serif;
$font-secondary: 'Cabin', 'Open Sans', sans-serif;
$font-monospace: Menlo, Monaco, 'Courier New', monospace;
$font-icon: Menlo, Monaco, 'Courier New', monospace;
$font-size: 14px !default;
Expand All @@ -34,9 +34,9 @@ $line-height-computed: floor(($font-size * $line-height)) !default; // ~20px


/* Headings */
$headings-font-weight-h1: normal;
$headings-font-weight-h1: 500;
$headings-font-family: $font-secondary;
$headings-font-weight: normal;
$headings-font-weight: 500;
$headings-line-height: 100%;
$headings-color: $color-gray-dark;

Expand Down Expand Up @@ -221,6 +221,7 @@ $navbar-top-menu-padding-bottom: 28px;

$navbar-top-title-size: 36px;
$navbar-top-title-color: #ffffff;
$navbar-top-title-fontweight: 600;
$navbar-top-title-bg: transparent;
$navbar-top-title-padding-bottom: 16px;
$navbar-top-title-width: auto;
Expand Down
Binary file removed fonts/MuseoSans_700Web.eot
Binary file not shown.
Binary file removed fonts/MuseoSans_700Web.woff
Binary file not shown.
Binary file removed fonts/OpenSans-Bold.ttf
Binary file not shown.
Binary file removed fonts/OpenSans-Italic.ttf
Binary file not shown.
Binary file removed fonts/OpenSans-Regular.ttf
Binary file not shown.

0 comments on commit 3ba969c

Please sign in to comment.