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

use fira sans web font instead. add base colors and vars #3

Merged
merged 1 commit into from
May 1, 2017
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: 2 additions & 0 deletions src/default.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<meta name="HandheldFriendly" content="True">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link href="https://fonts.googleapis.com/css?family=Fira+Sans:200,400,700" rel="stylesheet">

{{!-- Stylesheet --}}
<link rel="stylesheet" href="{{asset "css/app.css"}}">
</head>
Expand Down
Binary file removed src/fonts/fira-sans/FiraSans-Bold.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-BoldItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Book.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-BookItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Eight.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-EightItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-ExtraBold.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-ExtraBoldItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-ExtraLight.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-ExtraLightItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Four.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-FourItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Hair.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-HairItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Heavy.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-HeavyItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Italic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Light.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-LightItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Medium.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-MediumItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Regular.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-SemiBold.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-SemiBoldItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Thin.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-ThinItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Two.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-TwoItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-Ultra.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-UltraItalic.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-UltraLight.otf
Binary file not shown.
Binary file removed src/fonts/fira-sans/FiraSans-UltraLightItalic.otf
Binary file not shown.
45 changes: 0 additions & 45 deletions src/fonts/fira-sans/SIL Open Font License.txt

This file was deleted.

13 changes: 10 additions & 3 deletions src/index.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{{!< default}}
<header>
<h1>{{@blog.title}}</h1>
<h2>{{@blog.description}}</h2>
<header class="site-header">
<div class="site-header__logo">
<a href="/">
<img src="assets/images/lesaca-logo.svg" alt="Lesaca Logo">
</a>
</div>
<h1>Lesaca</h1>
</header>
<section class="site-block l-half">

</section>
34 changes: 34 additions & 0 deletions src/scss/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
$site-padding: 1em;

body {
background-color: $color-site-plum;
background-image: url('../images/face_bg.jpg');
background-repeat: no-repeat;
font-family: 'Fira Sans', sans-serif;
font-weight: 200;
color: $color-site-white;
@include line-height('body');
}

h1, h2, h3 {
@include line-height('heading');
}

h1 {
@include font-size('51');
}

h2 {
@include font-size('38');
}

h3 {
@include font-size('51');
}



a,
a:active {
color: $color-site-pink;
}
20 changes: 20 additions & 0 deletions src/scss/_colors.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
$color-site-plum: #2a0926;
$color-site-plum-10: lighten($color-site-plum, 10%);
$color-site-plum-20: lighten($color-site-plum, 20%);

$color-site-navy: #010326;
$color-site-navy-10: lighten($color-site-navy, 10%);
$color-site-navy-20: lighten($color-site-navy, 20%);

$color-site-blue: #012840;
$color-site-blue-10: lighten($color-site-blue, 10%);
$color-site-blue-20: lighten($color-site-blue, 20%);

$color-site-pink: #f30b55;
$color-site-pink-10: lighten($color-site-pink, 10%);
$color-site-pink-20: lighten($color-site-pink, 20%);

$color-site-gray: #54717f;

$color-site-white: #ffffff;
$color-site-black: #000000;
11 changes: 0 additions & 11 deletions src/scss/_font-face.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,3 @@
font-weight: 800;
src: url('../fonts/Majesti-Banner/Majesti-Banner-HeavyItalic.otf') format('otf');
}

//--------------
//Fira Sans
//--------------

@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 200;
src: url('../fonts/fira-sans/FiraSans-ExtraLight.otf') format('otf');
}
Empty file added src/scss/_vars.scss
Empty file.
10 changes: 10 additions & 0 deletions src/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,14 @@

@import 'reset';
@import 'font-face';
@import 'colors';
@import 'typography';
@import 'base';


//-------------------
// Components
//-------------------

@import 'components/header';
@import 'components/block';
3 changes: 3 additions & 0 deletions src/scss/components/_block.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.site-block {
display: flex;
}
6 changes: 6 additions & 0 deletions src/scss/components/_header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.site-header {
padding: 3em;
&__logo {
width: 20em;
}
}