Merge pull request #2 from dlesaca/font-face

Font face

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+>>>>>>> 189dea6d43e3250573e483cf1094bd2335882cad
 node_modules
 public
 data/ghost-dev.db

gulp/tasks/build.js

@@ -12,7 +12,7 @@ gulp.task('build', (callback) => {
     'ghost:start',
     () => {
       gulp.watch('./src/**/*.hbs', ['handlebars', 'ghost:restart', 'browser-sync:reload']);
-      gulp.watch('./src/sass/**/*.scss', ['sass', 'browser-sync:reload']);
+      gulp.watch('./src/scss/**/*.scss', ['sass:css', 'browser-sync:reload']);
       gulp.watch('./src/js/**/*.js', ['js', 'browser-sync:reload']);
       return callback;
     }

gulp/tasks/fonts.js

@@ -3,5 +3,5 @@ var gulp = require('gulp');
 //Builds fonts
 gulp.task('fonts', () => {
   return gulp.src('./src/fonts/**/*')
-  .pipe(gulp.dest('./public/assets/css/fonts'));
+  .pipe(gulp.dest('./public/assets/fonts'));
 });

gulp/tasks/images.js

@@ -3,7 +3,7 @@ var imagemin = require('gulp-imagemin');
 
 //Builds Images
 gulp.task('images', () => {
-  return gulp.src('./src/images/**/*.+(png|jpg|jpeg|gif|svg|ico)')
+  return gulp.src('./src/image/**/*.+(png|jpg|jpeg|gif|svg|ico)')
   .pipe(imagemin()) //compress images
-  .pipe(gulp.dest('./public/assets/img'));
+  .pipe(gulp.dest('./public/assets/images'));
 });

gulp/tasks/sass.js

@@ -16,5 +16,5 @@ gulp.task('sass:css', () => {
   }))
   .pipe(sass())
   .pipe(sourcemaps.write())                                                     //Write sourcemaps
-  .pipe(gulp.dest(config.paths.public + '/css'));
+  .pipe(gulp.dest(config.paths.assets + '/css'));
 });

src/scss/_font-face.scss

@@ -0,0 +1,84 @@
+//--------------
+//Majesti Banner
+//--------------
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: normal;
+  font-weight: 200;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-Light.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: italic;
+  font-weight: 200;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-LightItalic.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: normal;
+  font-weight: 300;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-Book.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: italic;
+  font-weight: 300;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-BookItalic.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-Medium.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: italic;
+  font-weight: 400;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-MediumItalic.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-Bold.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: italic;
+  font-weight: 700;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-BoldItalic.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: normal;
+  font-weight: 800;
+  src: url('../fonts/Majesti-Banner/Majesti-Banner-Heavy.otf') format('otf');
+}
+
+@font-face {
+  font-family: 'Majesti Banner';
+  font-style: italic;
+  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');
+}

src/scss/app.scss

@@ -3,4 +3,5 @@
 //-------------------
 
 @import 'reset';
+@import 'font-face';
 @import 'typography';