diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7b9d26a..c04c558 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,10 +3,11 @@ - - - - + + + + + - - - - - - @@ -88,7 +83,8 @@ - + + diff --git a/app/assets/images/avatar.svg b/app/assets/images/avatar.svg deleted file mode 100644 index c991259..0000000 --- a/app/assets/images/avatar.svg +++ /dev/null @@ -1,295 +0,0 @@ - -image/svg+xml diff --git a/app/scss/layout/_header.scss b/app/scss/layout/_header.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/css/base.css b/css/base.css similarity index 100% rename from app/css/base.css rename to css/base.css diff --git a/app/css/main.css b/css/main.css similarity index 99% rename from app/css/main.css rename to css/main.css index cf6026a..bea708c 100644 --- a/app/css/main.css +++ b/css/main.css @@ -265,3 +265,7 @@ section a:hover { font-size: 6em; } } + +.twitter:hover { + opacity: 0.7; +} diff --git a/gulpfile.js b/gulpfile.js index bfe84eb..5623e85 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -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')); @@ -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')); }); \ No newline at end of file diff --git a/img/avatar.png b/img/avatar.png deleted file mode 100644 index 1d95587..0000000 Binary files a/img/avatar.png and /dev/null differ diff --git a/app/index.html b/index.html similarity index 100% rename from app/index.html rename to index.html diff --git a/app/js/jquery-3.6.0.min.js b/js/jquery-3.6.0.min.js similarity index 100% rename from app/js/jquery-3.6.0.min.js rename to js/jquery-3.6.0.min.js diff --git a/app/scss/components/_classes.scss b/scss/components/_classes.scss similarity index 100% rename from app/scss/components/_classes.scss rename to scss/components/_classes.scss diff --git a/app/scss/main.scss b/scss/main.scss similarity index 85% rename from app/scss/main.scss rename to scss/main.scss index 79a1c22..3b901c7 100644 --- a/app/scss/main.scss +++ b/scss/main.scss @@ -7,8 +7,5 @@ // Components @import "components/classes"; -// Layout -@import "layout/header"; - // Pages @import "pages/home"; \ No newline at end of file diff --git a/app/scss/pages/_home.scss b/scss/pages/_home.scss similarity index 98% rename from app/scss/pages/_home.scss rename to scss/pages/_home.scss index ecf987c..59d1a84 100644 --- a/app/scss/pages/_home.scss +++ b/scss/pages/_home.scss @@ -227,4 +227,10 @@ section a { font-size: 6em; } } +} + +.twitter { + &:hover { + opacity: 0.7; + } } \ No newline at end of file diff --git a/app/scss/utilities/_extends.scss b/scss/utilities/_extends.scss similarity index 100% rename from app/scss/utilities/_extends.scss rename to scss/utilities/_extends.scss diff --git a/app/scss/utilities/_mixins.scss b/scss/utilities/_mixins.scss similarity index 100% rename from app/scss/utilities/_mixins.scss rename to scss/utilities/_mixins.scss diff --git a/app/scss/utilities/_reset.scss b/scss/utilities/_reset.scss similarity index 100% rename from app/scss/utilities/_reset.scss rename to scss/utilities/_reset.scss diff --git a/app/scss/utilities/_variables.scss b/scss/utilities/_variables.scss similarity index 100% rename from app/scss/utilities/_variables.scss rename to scss/utilities/_variables.scss