Skip to content
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
18 changes: 7 additions & 11 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

295 changes: 0 additions & 295 deletions app/assets/images/avatar.svg

This file was deleted.

Empty file removed app/scss/layout/_header.scss
Empty file.
File renamed without changes.
4 changes: 4 additions & 0 deletions app/css/main.css → css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -265,3 +265,7 @@ section a:hover {
font-size: 6em;
}
}

.twitter:hover {
opacity: 0.7;
}
20 changes: 10 additions & 10 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,34 @@ const { watch } = require('gulp');
gulp.task('browser-sync', function(cb) {
browserSync.init({
server: {
baseDir: "./app"
baseDir: "./docs"
}
});

browserSync.watch('app/').on('change', browserSync.reload);
browserSync.watch('docs/').on('change', browserSync.reload);

cb();
});

gulp.task('sass', function(cb) {
gulp.src('app/scss/**/*.scss')
gulp.src('docs/scss/**/*.scss')
.pipe(sass({
outputStyle: 'expanded',
}).on('error', sass.logError))
.pipe(autoprefixer(
['Last 30 versions']
))
.pipe(gulp.dest('app/css'))
.pipe(gulp.dest('docs/css'))
.pipe(browserSync.reload({stream: true}));

cb();
});

gulp.task('tinypng', function () {
return gulp.src('app/img/**/*.{png,jpg,jpeg}')
return gulp.src('docs/img/**/*.{png,jpg,jpeg}')
.pipe(tinypng({
key: 'CMX7yWxk1lc5Fp9nMWGlRX7pMBGrwGsc',
sigFile: 'app/img/.tinypng-sigs',
sigFile: 'docs/img/.tinypng-sigs',
log: true
}))
.pipe(gulp.dest('img'));
Expand All @@ -52,11 +52,11 @@ gulp.task('scripts', function () {
noImplicitAny: true,
outFile: 'output.js'
}))
.pipe(gulp.dest('app/js'));
.pipe(gulp.dest('docs/js'));
});

gulp.task('default', function() {
gulp.watch('app/**/*.html', gulp.series('browser-sync'));
gulp.watch('app/**/*.scss', gulp.series('sass','browser-sync'));
gulp.watch('app/img/**/*.{png,jpg,jpeg}', gulp.series('tinypng'));
gulp.watch('docs/**/*.html', gulp.series('browser-sync'));
gulp.watch('docs/**/*.scss', gulp.series('sass','browser-sync'));
gulp.watch('docs/img/**/*.{png,jpg,jpeg}', gulp.series('tinypng'));
});
Binary file removed img/avatar.png
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 0 additions & 3 deletions app/scss/main.scss → scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@
// Components
@import "components/classes";

// Layout
@import "layout/header";

// Pages
@import "pages/home";
6 changes: 6 additions & 0 deletions app/scss/pages/_home.scss → scss/pages/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,10 @@ section a {
font-size: 6em;
}
}
}

.twitter {
&:hover {
opacity: 0.7;
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.