diff options
author | Man <rawww@DESKTOP-N753HBN.localdomain> | 2020-02-05 16:18:03 +0300 |
---|---|---|
committer | Man <rawww@DESKTOP-N753HBN.localdomain> | 2020-02-05 16:18:03 +0300 |
commit | 0bf9bbc44235f9fd834381796e3d4b29e36c7bed (patch) | |
tree | 4ef1f18d502627febd8f4f02ea035d742dbb1268 | |
parent | 32abafa21fbd1f94fc34cdff0a292729a33c4b61 (diff) |
add gitignore, add stylelint scss extention
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | assets/.stylelintrc.js | 2 | ||||
-rw-r--r-- | assets/package.json | 1 | ||||
-rw-r--r-- | assets/scss/_header.scss | 4 | ||||
-rw-r--r-- | assets/scss/_mixins.scss | 18 | ||||
-rw-r--r-- | assets/yarn.lock | 7 | ||||
-rw-r--r-- | layouts/partials/header.html | 32 | ||||
-rw-r--r-- | static/css/style.css | 4 | ||||
-rw-r--r-- | static/css/style.css.map | 2 |
9 files changed, 53 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0b54f26 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +assets/node_modules/
\ No newline at end of file diff --git a/assets/.stylelintrc.js b/assets/.stylelintrc.js index d5757b8..b6ce156 100644 --- a/assets/.stylelintrc.js +++ b/assets/.stylelintrc.js @@ -1,3 +1,3 @@ module.exports = { - "extends": "stylelint-config-recommended" + "extends": "stylelint-config-recommended-scss" } diff --git a/assets/package.json b/assets/package.json index a6f6470..c7b8c85 100644 --- a/assets/package.json +++ b/assets/package.json @@ -12,6 +12,7 @@ "devDependencies": { "stylelint": "^13.0.0", "stylelint-config-recommended": "^3.0.0", + "stylelint-config-recommended-scss": "^4.2.0", "stylelint-scss": "^3.14.2" } } diff --git a/assets/scss/_header.scss b/assets/scss/_header.scss index 9161eed..168baf2 100644 --- a/assets/scss/_header.scss +++ b/assets/scss/_header.scss @@ -50,3 +50,7 @@ header { font-size: 2rem; font-weight: bold; } + +.header-nav { + display: flex; +}
\ No newline at end of file diff --git a/assets/scss/_mixins.scss b/assets/scss/_mixins.scss new file mode 100644 index 0000000..6b4bba5 --- /dev/null +++ b/assets/scss/_mixins.scss @@ -0,0 +1,18 @@ +@mixin flex-align($options) {
+ display: flex;
+ @if $option == center {
+ align-items: center;
+ }
+ @else if $option == start {
+ align-items: flex-start;
+ }
+ @else if $option == end {
+ align-items: flex-end;
+ }
+ @else if $option == stretch {
+ align-items: stretch;
+ }
+ @else if $option == baseline {
+ align-items: baseline;
+ }
+}
\ No newline at end of file diff --git a/assets/yarn.lock b/assets/yarn.lock index 09b3539..818306c 100644 --- a/assets/yarn.lock +++ b/assets/yarn.lock @@ -1629,6 +1629,13 @@ style-search@^0.1.0: resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI= +stylelint-config-recommended-scss@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.2.0.tgz#3ad3fc858215cfd16a0f90aecf1ac0ea8a3e6971" + integrity sha512-4bI5BYbabo/GCQ6LbRZx/ZlVkK65a1jivNNsD+ix/Lw0U3iAch+jQcvliGnnAX8SUPaZ0UqzNVNNAF3urswa7g== + dependencies: + stylelint-config-recommended "^3.0.0" + stylelint-config-recommended@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657" diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8a3d48d..c37c418 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,19 +1,19 @@ <header> - <div class="header header-frame"> - <div> - <div class="header-title">{{.Site.Title}}</div> - {{if .Site.Params.Description}} - <div class="header-description">{{.Site.Params.Description}}</div> - {{end}} - </div> - <nav> - <ul class="header-nav"> - {{ range .Site.Taxonomies.tags }} - <li class="header-nav-item"><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ .Count }}</li> - {{end}} - </ul> - </nav> - + <div class="header header-frame"> + <div> + <div class="header-title">{{.Site.Title}}</div> + {{if .Site.Params.Description}} + <div class="header-description">{{.Site.Params.Description}}</div> + {{end}} </div> + <nav> + <ul class="header-nav"> + {{ range .Site.Taxonomies.tags }} + <li class="header-nav-item"> + <a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ .Count }} + </li> + {{end}} + </ul> + </nav> + </div> </header> - diff --git a/static/css/style.css b/static/css/style.css index 789d20c..3d6852c 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -147,4 +147,8 @@ header { font-weight: bold; } +.header-nav { + display: flex; +} + /*# sourceMappingURL=style.css.map */ diff --git a/static/css/style.css.map b/static/css/style.css.map index 2ed8801..864d18f 100644 --- a/static/css/style.css.map +++ b/static/css/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../assets/scss/style.scss","../../assets/scss/_header.scss","../../assets/scss/_vars.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EACA;EACA;EACA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;AAAA;EAEC;EACA;;;AAED;EACC;EACA;;;ACtFD;EACE,WCGW;EDFX;EACA;;AACA;EAJF;IAKI;;;;AAOJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA","file":"style.css"}
\ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../assets/scss/style.scss","../../assets/scss/_header.scss","../../assets/scss/_vars.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EACA;EACA;EACA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;AAAA;EAEC;EACA;;;AAED;EACC;EACA;;;ACtFD;EACE,WCGW;EDFX;EACA;;AACA;EAJF;IAKI;;;;AAOJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE","file":"style.css"}
\ No newline at end of file |