Skip to content

Commit 33a0994

Browse files
authored
Merge pull request #28 from 44-5-53-6-k/main
Main to develop
2 parents 1172c7d + 448b195 commit 33a0994

16 files changed

Lines changed: 27 additions & 319 deletions

File tree

.idea/workspace.xml

Lines changed: 7 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/images/avatar.svg

Lines changed: 0 additions & 295 deletions
This file was deleted.

app/scss/layout/_header.scss

Whitespace-only changes.
File renamed without changes.

app/css/main.css renamed to css/main.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,3 +265,7 @@ section a:hover {
265265
font-size: 6em;
266266
}
267267
}
268+
269+
.twitter:hover {
270+
opacity: 0.7;
271+
}

gulpfile.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,34 @@ const { watch } = require('gulp');
1313
gulp.task('browser-sync', function(cb) {
1414
browserSync.init({
1515
server: {
16-
baseDir: "./app"
16+
baseDir: "./docs"
1717
}
1818
});
1919

20-
browserSync.watch('app/').on('change', browserSync.reload);
20+
browserSync.watch('docs/').on('change', browserSync.reload);
2121

2222
cb();
2323
});
2424

2525
gulp.task('sass', function(cb) {
26-
gulp.src('app/scss/**/*.scss')
26+
gulp.src('docs/scss/**/*.scss')
2727
.pipe(sass({
2828
outputStyle: 'expanded',
2929
}).on('error', sass.logError))
3030
.pipe(autoprefixer(
3131
['Last 30 versions']
3232
))
33-
.pipe(gulp.dest('app/css'))
33+
.pipe(gulp.dest('docs/css'))
3434
.pipe(browserSync.reload({stream: true}));
3535

3636
cb();
3737
});
3838

3939
gulp.task('tinypng', function () {
40-
return gulp.src('app/img/**/*.{png,jpg,jpeg}')
40+
return gulp.src('docs/img/**/*.{png,jpg,jpeg}')
4141
.pipe(tinypng({
4242
key: 'CMX7yWxk1lc5Fp9nMWGlRX7pMBGrwGsc',
43-
sigFile: 'app/img/.tinypng-sigs',
43+
sigFile: 'docs/img/.tinypng-sigs',
4444
log: true
4545
}))
4646
.pipe(gulp.dest('img'));
@@ -52,11 +52,11 @@ gulp.task('scripts', function () {
5252
noImplicitAny: true,
5353
outFile: 'output.js'
5454
}))
55-
.pipe(gulp.dest('app/js'));
55+
.pipe(gulp.dest('docs/js'));
5656
});
5757

5858
gulp.task('default', function() {
59-
gulp.watch('app/**/*.html', gulp.series('browser-sync'));
60-
gulp.watch('app/**/*.scss', gulp.series('sass','browser-sync'));
61-
gulp.watch('app/img/**/*.{png,jpg,jpeg}', gulp.series('tinypng'));
59+
gulp.watch('docs/**/*.html', gulp.series('browser-sync'));
60+
gulp.watch('docs/**/*.scss', gulp.series('sass','browser-sync'));
61+
gulp.watch('docs/img/**/*.{png,jpg,jpeg}', gulp.series('tinypng'));
6262
});

img/avatar.png

-59.1 KB
Binary file not shown.
File renamed without changes.

0 commit comments

Comments
 (0)