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

Font face #2

Merged
merged 3 commits 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
>>>>>>> 189dea6d43e3250573e483cf1094bd2335882cad
node_modules
public
data/ghost-dev.db
2 changes: 1 addition & 1 deletion gulp/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/fonts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
4 changes: 2 additions & 2 deletions gulp/tasks/images.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
2 changes: 1 addition & 1 deletion gulp/tasks/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
File renamed without changes.
Binary file added src/img/face_bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/face_bg_color_2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/img/lesaca-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions src/scss/_font-face.scss
Original file line number Diff line number Diff line change
@@ -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');
}
1 change: 1 addition & 0 deletions src/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
//-------------------

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