diff --git a/Makefile b/Makefile index ed19132..59a079a 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,13 @@ clean: doctrine-migration: PHP=$(PHP) ./bin/doctrine-migrate +.ONESHELL: +lint: + eslint --fix assets/js/**/*.{js,vue} + for f in assets/css/*.scss assets/css/app/*.scss; do + cssbeautify-cli -f $$f -w $$f.scss + done + build: clean js-routing asset .ONESHELL: diff --git a/assets/css/app.scss b/assets/css/app.scss index 1225f3d..ec98914 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -124,12 +124,8 @@ pre[class*="language-"] { } .navigation { - padding-top: 35px; font-size: 15px; - - &.navigation-with-avatar { - padding-top: 5px; - } + padding-top: 15px; .deblan-icon { margin-right: 13px; @@ -147,14 +143,12 @@ pre[class*="language-"] { li { padding: 0; - background: $color-navigation-item-background; } a { color: $color-white; display: block; padding: 12px 15px; - background: $color-navigation-item-background; &:hover, &.active, &:focus { background: $color-navigation-item-background-active; @@ -170,7 +164,7 @@ pre[class*="language-"] { $radius: 8px; background: $color-small-menu-background; - padding: 5px; + padding: 5px 0; position: fixed; bottom: 0; width: 100%; @@ -207,24 +201,8 @@ pre[class*="language-"] { .wide-menu { width: 230px; background: linear-gradient(to bottom, $color-wide-menu-background-from 0%, $color-wide-menu-background-to 500px); - padding: 10px 25px; + padding: 10px 0; min-height: calc(100vh - 130px); - - .navigation { - li { - $radius: 8px; - - &:first-child, &:first-child a { - border-top-right-radius: $radius; - border-top-left-radius: $radius; - } - - &:last-child, &:last-child a { - border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; - } - } - } } @keyframes gradientBackground { @@ -256,7 +234,7 @@ pre[class*="language-"] { .fixed-menu { position: fixed; - width: calc(230px - 50px); + width: 230px; } .content { diff --git a/assets/js/app.js b/assets/js/app.js index 8b57e7c..265cf08 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -24,7 +24,7 @@ const app = new App([ // new Stats(), new Particles(window), new MeshViewer(window), - new SmallMenu(window), + new SmallMenu(window) ]) window.addEventListener('load', function () { diff --git a/assets/js/app/code.js b/assets/js/app/code.js index 6b6ab7c..35710ec 100644 --- a/assets/js/app/code.js +++ b/assets/js/app/code.js @@ -90,7 +90,6 @@ Code.prototype.init = function () { post.insertBefore(win, pre) } - } module.exports = Code diff --git a/yarn.lock b/yarn.lock index 99c61a9..0af8417 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2857,7 +2857,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "2.1.2" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -4468,7 +4468,7 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -5214,11 +5214,6 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -5227,33 +5222,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._root@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" @@ -5334,11 +5307,6 @@ lodash.reject@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.some@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"