Skip to content

Commit

Permalink
adds fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Whitton committed Dec 18, 2014
1 parent 7ccf9c2 commit e778f5c
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 13 deletions.
46 changes: 33 additions & 13 deletions app/routes/application.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
import Ember from "ember";

var fonts = [{
name: 'Georgia',
className: 'georgia'
}, {
name: 'Helvetica',
className: 'helvetica'
}, {
name: 'Times New Roman',
className: 'times'
}, {
name: 'Avenir',
className: 'avenir'
}, {
name: 'Kim1',
className: 'kim1'
}, {
name: 'Kim2',
className: 'kim2'
}, {
name: 'Sep',
className: 'sep'
}, {
name: 'Wildchild',
className: 'wildchild'
}]
export default Ember.Route.extend({
model: function() {
return {
Expand All @@ -13,19 +38,14 @@ export default Ember.Route.extend({
}
return f
})(),
fonts: [Ember.Object.create({
name: "Georgia",
className: "georgia",
id: 1
}),Ember.Object.create({
name: "Helvetica",
className: "helvetica",
id: 2
}),Ember.Object.create({
name: "Times New Roman",
className: "times",
id: 3
})],
fonts: (() => {
var f = []
for (var i = 0; i < fonts.length; i++) {
fonts[i].id = i+1
f.push( Ember.Object.create(fonts[i]) )
}
return f
})(),
palettes : [Ember.Object.create({
id: 1,
colors: ["#1ab6f5", "#1a86f5"]
Expand Down
25 changes: 25 additions & 0 deletions app/styles/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
$fontPath: '/assets/fonts/';
@include font-face(Avenir, font-files("#{$fontPath}avenir.ttf"));
@include font-face(Kim1, font-files("#{$fontPath}kim1.ttf"));
@include font-face(Kim2, font-files("#{$fontPath}kim2.ttf"));
@include font-face(Sep, font-files("#{$fontPath}sep.ttf"));
@include font-face(Wildchild, font-files("#{$fontPath}wildchild.ttf"));

.times {
font-family: "Times New Roman";
}
Expand All @@ -10,3 +17,21 @@
font-family: "Helvetica";
}

.avenir {
font-family: 'Avenir';
font-weight: 300 !important;
}

.kim1 {
font-family: 'Kim1';
letter-spacing: 1px;
}
.kim2 {
font-family: 'Kim2';
}
.sep {
font-family: 'Sep';
}
.wildchild {
font-family: 'Wildchild';
}
Binary file added public/assets/fonts/avenir.ttf
Binary file not shown.
Binary file added public/assets/fonts/kim1.ttf
Binary file not shown.
Binary file added public/assets/fonts/kim2.ttf
Binary file not shown.
Binary file added public/assets/fonts/sep.ttf
Binary file not shown.
Binary file added public/assets/fonts/wildchild.ttf
Binary file not shown.

0 comments on commit e778f5c

Please sign in to comment.