diff options
author | Matthew Rhone <matthew.rhone@outlook.com> | 2017-01-08 23:00:13 +0300 |
---|---|---|
committer | Matthew Rhone <matthew.rhone@outlook.com> | 2017-01-08 23:00:13 +0300 |
commit | 43a5d6d42368b302af5e345741c59f366bc97a81 (patch) | |
tree | 6b5121b3d5c74e0ecae02153633dbbd7cf92ae16 | |
parent | ab7725e5997a0d8f0015e9a80b11aa9cc0236c50 (diff) |
Fix gulp file and default watch issues.
-rw-r--r-- | postcss/gulpfile.js | 6 | ||||
-rw-r--r-- | postcss/src/style.min.css | 2 | ||||
-rw-r--r-- | static/css/style.min.css | 209 |
3 files changed, 150 insertions, 67 deletions
diff --git a/postcss/gulpfile.js b/postcss/gulpfile.js index ddcc6dd..9cae950 100644 --- a/postcss/gulpfile.js +++ b/postcss/gulpfile.js @@ -4,6 +4,7 @@ var gulp = require('gulp'), cssnano = require('cssnano'), autoprefixer = require('autoprefixer')({}), watch = require('gulp-watch'), + notify = require('gulp-notify'), rucksack = require('rucksack-css'), simplevars = require('postcss-simple-vars'), fontmagician = require('postcss-font-magician')({protocol: 'https:'}), @@ -21,11 +22,12 @@ gulp.task('css', function() { ] return gulp.src('src/style.min.css') .pipe(postcss(processors)) - .pipe(gulp.dest('../static/css')); + .pipe(gulp.dest('../static/css')) + .pipe(notify({ message: 'Post CSS processing task complete' })); }); gulp.task('default', ['css', 'watch']); gulp.task('watch', function() { - gulp.watch('src/main.css', ['css']) + gulp.watch('src/*.css', ['css']) }); diff --git a/postcss/src/style.min.css b/postcss/src/style.min.css index 36dab7d..877ea8f 100644 --- a/postcss/src/style.min.css +++ b/postcss/src/style.min.css @@ -48,7 +48,7 @@ h1,h2,h3,h4,h5,h6 { color:#fff;font-weight:700; } .header a.title { - font-size: responsive 34px 38 px; + font-size: responsive 34px 38px; } .header span.title-description { font-size: responsive 14px 18px; diff --git a/static/css/style.min.css b/static/css/style.min.css index bd70102..a6b2fc2 100644 --- a/static/css/style.min.css +++ b/static/css/style.min.css @@ -1,18 +1,40 @@ -@font-face { font-family: Lora; font-style: italic; font-weight: 400; src: local("Lora Italic"),local(Lora-Italic),url(https://fonts.gstatic.com/s/lora/v9/EJ2E0VlN4DLy-wT0t9nagw.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/wXeMvRh7Gui36p_I04Ex6g.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/wXeMvRh7Gui36p_I04Ex6g.woff) format("woff"); +@font-face { + font-family: Lora; + font-style: italic; + font-weight: 400; + src: local("Lora Italic"),local(Lora-Italic),url(https://fonts.gstatic.com/s/lora/v9/EJ2E0VlN4DLy-wT0t9nagw.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/wXeMvRh7Gui36p_I04Ex6g.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/wXeMvRh7Gui36p_I04Ex6g.woff) format("woff"); } -@font-face { font-family: Lora; font-style: italic; font-weight: 700; src: local("Lora Bold Italic"),local(Lora-BoldItalic),url(https://fonts.gstatic.com/s/lora/v9/_IxjUs2lbQSu0MyFEAfa7fY6323mHUZFJMgTvxaG2iE.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/_IxjUs2lbQSu0MyFEAfa7T8E0i7KZn-EPnyo3HZu7kw.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/_IxjUs2lbQSu0MyFEAfa7T8E0i7KZn-EPnyo3HZu7kw.woff) format("woff"); +@font-face { + font-family: Lora; + font-style: italic; + font-weight: 700; + src: local("Lora Bold Italic"),local(Lora-BoldItalic),url(https://fonts.gstatic.com/s/lora/v9/_IxjUs2lbQSu0MyFEAfa7fY6323mHUZFJMgTvxaG2iE.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/_IxjUs2lbQSu0MyFEAfa7T8E0i7KZn-EPnyo3HZu7kw.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/_IxjUs2lbQSu0MyFEAfa7T8E0i7KZn-EPnyo3HZu7kw.woff) format("woff"); } -@font-face { font-family: Lora; font-style: normal; font-weight: 400; src: local(Lora),local(Lora-Regular),url(https://fonts.gstatic.com/s/lora/v9/rMDaOpSw-8ss9B8Y3bLqyA.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/5-AYViExptypIdFoLKAxTA.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/5-AYViExptypIdFoLKAxTA.woff) format("woff"); +@font-face { + font-family: Lora; + font-style: normal; + font-weight: 400; + src: local(Lora),local(Lora-Regular),url(https://fonts.gstatic.com/s/lora/v9/rMDaOpSw-8ss9B8Y3bLqyA.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/5-AYViExptypIdFoLKAxTA.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/5-AYViExptypIdFoLKAxTA.woff) format("woff"); } -@font-face { font-family: Lora; font-style: normal; font-weight: 700; src: local("Lora Bold"),local(Lora-Bold),url(https://fonts.gstatic.com/s/lora/v9/1HJZfNlOezBHPPwzRKlEcQ.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/XpaepWHcooQHSRnzoohUng.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/XpaepWHcooQHSRnzoohUng.woff) format("woff"); +@font-face { + font-family: Lora; + font-style: normal; + font-weight: 700; + src: local("Lora Bold"),local(Lora-Bold),url(https://fonts.gstatic.com/s/lora/v9/1HJZfNlOezBHPPwzRKlEcQ.eot?#) format("eot"),url(https://fonts.gstatic.com/s/lora/v9/XpaepWHcooQHSRnzoohUng.woff) format("woff2"),url(https://fonts.gstatic.com/s/lora/v9/XpaepWHcooQHSRnzoohUng.woff) format("woff"); } -body { line-height: 1.6; +body { + line-height: 1.6; font-weight: 400; font-family: "Lora", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; - background:#181818;color:#fff; - } -a:hover, .post-list-pagination{color:#fff;} -a:hover{text-decoration: underline;} + background:#181818; + color:#fff; +} +a:hover, .post-list-pagination{ + color:#fff; +} +a:hover{ + text-decoration: underline; +} .wrap { display: flex; flex-flow: row wrap; @@ -20,11 +42,21 @@ a:hover{text-decoration: underline;} margin-left: auto; margin-right: auto; } -h1,h2,h3,h4,h5,h6 {color: #676767;} -.header, .navbar { flex-grow: 0; flex-shrink: 0; flex-basis: calc(99.9% * 1 - (30px - 30px * 1)); width: calc(99.9% * 1 - (30px - 30px * 1));} -.header:nth-child(1n), .navbar:nth-child(1n) { margin-right: 30px; margin-left: 0; +h1,h2,h3,h4,h5,h6 { + color: #676767; } -.header:last-child, .navbar:last-child { margin-right: 0; +.header, .navbar { + flex-grow: 0; + flex-shrink: 0; + flex-basis: calc(99.9% * 1 - (30px - 30px * 1)); + width: calc(99.9% * 1 - (30px - 30px * 1)); +} +.header:nth-child(1n), .navbar:nth-child(1n) { + margin-right: 30px; + margin-left: 0; +} +.header:last-child, .navbar:last-child { + margin-right: 0; } .header a{ text-decoration: none; @@ -35,40 +67,58 @@ h1,h2,h3,h4,h5,h6 {color: #676767;} -webkit-transition: opacity .55s ease-in-out; } .header a.active{ - color: #585858; } + color: #585858; +} .header a:hover{ opacity: 0.5; } -.header, .tags {color:#fff;font-weight:700;} -.header a.title {font-size: calc(34px + 4 * ((100vw - 420px) / 860));} +.header, .tags { + color:#fff;font-weight:700; +} +.header a.title { + font-size: calc(34px + 4 * ((100vw - 420px) / 860)); +} @media screen and (min-width: 1280px) { - .header a.title { font-size: 38; + .header a.title { + font-size: 38px; } } @media screen and (max-width: 420px) { - .header a.title { font-size: 34px; + .header a.title { + font-size: 34px; } } -.header span.title-description {font-size: calc(14px + 4 * ((100vw - 420px) / 860));} +.header span.title-description { + font-size: calc(14px + 4 * ((100vw - 420px) / 860)); +} @media screen and (min-width: 1280px) { - .header span.title-description { font-size: 18px; + .header span.title-description { + font-size: 18px; } } @media screen and (max-width: 420px) { - .header span.title-description { font-size: 14px; + .header span.title-description { + font-size: 14px; } } -a.navbar-link, a.post-title-link{font-weight:700;} -code {color: #866c6c;} -a {color: #676767;} +a.navbar-link, a.post-title-link{ + font-weight:700; +} +code { + color: #866c6c; +} +a { + color: #676767; +} .navbar-list { list-style: none; margin-bottom: 0; - } +} .navbar-item { position: relative; float: left; - margin-bottom: 0; } + margin-bottom: 0; +} .navbar-link { text-transform: uppercase; font-size: calc(12px + 4 * ((100vw - 420px) / 860)); @@ -76,18 +126,22 @@ a {color: #676767;} letter-spacing: .2rem; margin-right: 35px; text-decoration: none; - color: #676767; } + color: #676767; +} @media screen and (min-width: 1280px) { - .navbar-link { font-size: 16px; + .navbar-link { + font-size: 16px; } } @media screen and (max-width: 420px) { - .navbar-link { font-size: 12px; + .navbar-link { + font-size: 12px; } } - .navbar-link.active { - color: #585858; } - .navbar-link:hover { +.navbar-link.active { + color: #585858; +} +.navbar-link:hover { color: #aeaeae; } .copyright{ @@ -97,18 +151,23 @@ a {color: #676767;} width: calc(99.9% * 1 - (30px - 30px * 1)); color: #676767; } -.copyright:nth-child(1n) { margin-right: 30px; margin-left: 0; +.copyright:nth-child(1n) { + margin-right: 30px; + margin-left: 0; } -.copyright:last-child { margin-right: 0; +.copyright:last-child { + margin-right: 0; } -.copyright p { +.copyright p, .tags a, .tags { font-size: calc(12px + 3 * ((100vw - 420px) / 860));} @media screen and (min-width: 1280px) { - .copyright p { font-size: 15px; + .copyright p, .tags a, .tags { + font-size: 15px; } } @media screen and (max-width: 420px) { - .copyright p { font-size: 12px; + .copyright p, .tags a, .tags { + font-size: 12px; } } .content-tags, .post-title { @@ -117,11 +176,16 @@ a {color: #676767;} flex-basis: calc(99.9% * 7/12 - (30px - 30px * 7/12)); width: calc(99.9% * 7/12 - (30px - 30px * 7/12)); } -.content-tags:nth-child(1n), .post-title:nth-child(1n) { margin-right: 30px; margin-left: 0; +.content-tags:nth-child(1n), .post-title:nth-child(1n) { + margin-right: 30px; + margin-left: 0; } -.content-tags:last-child, .post-title:last-child { margin-right: 0; +.content-tags:last-child, .post-title:last-child { + margin-right: 0; } -.content-tags:nth-child(0n), .post-title:nth-child(0n) { margin-right: 0; margin-left: auto; +.content-tags:nth-child(0n), .post-title:nth-child(0n) { + margin-right: 0; + margin-left: auto; } .content-full { flex-grow: 0; @@ -129,9 +193,12 @@ a {color: #676767;} flex-basis: calc(99.9% * 1 - (30px - 30px * 1)); width: calc(99.9% * 1 - (30px - 30px * 1)); } -.content-full:nth-child(1n) { margin-right: 30px; margin-left: 0; +.content-full:nth-child(1n) { + margin-right: 30px; + margin-left: 0; } -.content-full:last-child { margin-right: 0; +.content-full:last-child { + margin-right: 0; } .pagination{ flex-grow: 0; @@ -142,16 +209,21 @@ a {color: #676767;} font-size: calc(16px + 3 * ((100vw - 420px) / 860)); } @media screen and (min-width: 1280px) { - .pagination { font-size: 19px; + .pagination { + font-size: 19px; } } @media screen and (max-width: 420px) { - .pagination { font-size: 16px; + .pagination { + font-size: 16px; } } -.pagination:nth-child(1n) { margin-right: 30px; margin-left: 0; +.pagination:nth-child(1n) { + margin-right: 30px; + margin-left: 0; } -.pagination:last-child { margin-right: 0; +.pagination:last-child { + margin-right: 0; } .tags { flex-grow: 0; @@ -159,29 +231,33 @@ a {color: #676767;} flex-basis: calc(99.9% * 2/12 - (30px - 30px * 2/12)); width: calc(99.9% * 2/12 - (30px - 30px * 2/12)); border-left: 3px solid #808080; padding-left: 8px; margin-top: 4px; - font-size:small; } -.tags:nth-child(1n) { margin-right: 30px; margin-left: 0; +.tags:nth-child(1n) { + margin-right: 30px; + margin-left: 0; } -.tags:last-child { margin-right: 0; +.tags:last-child { + margin-right: 0; } -.tags a { font-size:small;} .tags a, .pagination a{ color: #676767; text-decoration: none; } a.tag-link:hover, .pagination a:hover{ -color: #aeaeae; -text-decoration: underline; + color: #aeaeae; + text-decoration: underline; } p { margin-top: 5px; -font-size: calc(16px + 5 * ((100vw - 420px) / 860));} + font-size: calc(16px + 5 * ((100vw - 420px) / 860)); +} @media screen and (min-width: 1280px) { - p { font-size: 21px; + p { + font-size: 21px; } } @media screen and (max-width: 420px) { - p { font-size: 16px; + p { + font-size: 16px; } } .empty { @@ -190,24 +266,29 @@ font-size: calc(16px + 5 * ((100vw - 420px) / 860));} flex-basis: calc(99.9% * 1 - (30px - 30px * 1)); width: calc(99.9% * 1 - (30px - 30px * 1)); } -.empty:nth-child(1n) { margin-right: 30px; margin-left: 0; +.empty:nth-child(1n) { + margin-right: 30px; + margin-left: 0; } -.empty:last-child { margin-right: 0; +.empty:last-child { + margin-right: 0; } .post-title-link { -font-weight: 700; -font-size: calc(30px + 6 * ((100vw - 420px) / 860));; -color: #676767; -text-decoration: none; + font-weight: 700; + font-size: calc(30px + 6 * ((100vw - 420px) / 860));; + color: #676767; + text-decoration: none; } @media screen and (min-width: 1280px) { - .post-title-link { font-size: 36px; + .post-title-link { + font-size: 36px; } } @media screen and (max-width: 420px) { - .post-title-link { font-size: 30px; + .post-title-link { + font-size: 30px; } } .post-title-link:hover { -color: #aeaeae; + color: #aeaeae; } |