bad/projekt-sklep
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor refactors

Browse source
This commit is contained in:
a 2020-10-02 22:32:36 +02:00
parent 84f24b755c
commit 3157a249f4
5 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -5,7 +5,7 @@
"build": "webpack",
"watch": "webpack --watch",
"server": "webpack-dev-server",
"install-fontello":"fontello-cli install --config ./src/res/fontello/config.json --css src/res/fontello/css/ --font src/res/fontello/font",
"install-fontello": "fontello-cli install --config ./src/res/fontello/config.json --css src/res/fontello/css/ --font src/res/fontello/font",
"postinstall": "yarn install-fontello"
},
"main": "index.js",
@ -24,6 +24,7 @@
"posthtml-extend": "^0.5.0",
"posthtml-loader": "^2.0.1",
"prettier": "^2.1.1",
"resolve-cwd": "^3.0.0",
"resolve-url-loader": "^3.1.1",
"sass": "^1.26.10",
"sass-loader": "^10.0.2",
@ -33,6 +34,5 @@
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
}
"dependencies": {}
}

7
src/base.html
View file

@ -1,4 +1,3 @@
<!DOCTYPE html>
<html lang="en">
<head>
@ -7,8 +6,8 @@
<link rel="stylesheet" href="base.scss">
<block name="head"></block>
<head>
<body>
<div class="container do-a-barrel-roll">
<body class="do-a-barrel-roll">
<div class="container">
<header>
<div class="contact-login-cart-bar">
<div class="contact">
@ -18,7 +17,7 @@
</div>
<div class="login-cart">
<a href=#> Zaloguj się </a>
<a href="#"> Koszyk </a>
<!--<a href="#"> Koszyk </a> -->
</div>
</div>
<nav>

10
src/base.scss
View file

@ -19,7 +19,7 @@ body {
padding: 0px;
}
.container.do-a-barrel-roll {
.do-a-barrel-roll {
animation-duration: 2s;
animation-timing-function: ease;
animation-name: barrel-roll;
@ -39,8 +39,8 @@ body {
display: flex;
flex-direction: column;
width: 1200px;
max-width: 100vw;
width: 800px;
max-width: 97vw;
background-color: var(--background-secondary-1);
box-shadow: 0px 0px 5px 0px var(--background-opposite-1);
flex-grow: 1;
@ -119,6 +119,10 @@ nav {
justify-content: space-between;
}
main {
padding: 1em;
}
footer {
display: flex;
background-color: var(--background-opposite-3);

6
webpack.config.js
View file

@ -48,7 +48,7 @@ module.exports = {
},
{
test: /\.html$/,
test: /\.(html|php)$/,
use: [
"html-loader",
{
@ -60,6 +60,10 @@ module.exports = {
root: src,
}),
],
directives: [
{ name: "?php", start: "<", end: ">" },
{ name: "?=", start: "<", end: ">" },
],
},
},
],

20
yarn.lock
View file

@ -39,11 +39,6 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
"@fortawesome/fontawesome-free@^5.15.0":
version "5.15.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.0.tgz#631b04d6301fee06d4bd7a9824fe7157735cbdb6"
integrity sha512-wXetjQBNMTP59MAYNR1tdahMDOLx3FYj3PKdso7PLFLDpTvmAIqhSSEqnSTmWKahRjD+Sh5I5635+5qaoib5lw==
"@nodelib/fs.scandir@2.1.3":
version "2.1.3"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@ -3285,6 +3280,9 @@ import-local@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
dependencies:
pkg-dir "^3.0.0"
resolve-cwd "^2.0.0"
imurmurhash@^0.1.4:
version "0.1.4"
@ -4933,6 +4931,13 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
dependencies:
resolve-from "^3.0.0"
resolve-cwd@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@ -4948,6 +4953,11 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
expand-tilde "^2.0.0"
global-modules "^1.0.0"
resolve-from@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
integrity sha1-six699nWiBvItuZTM17rywoYh0g=
resolve-from@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"