diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png new file mode 100644 index 0000000..daa71b6 Binary files /dev/null and b/public/images/favicon-16x16.png differ diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png new file mode 100644 index 0000000..f66aa4f Binary files /dev/null and b/public/images/favicon-32x32.png differ diff --git a/public/images/favicon-96x96.png b/public/images/favicon-96x96.png new file mode 100644 index 0000000..2ae1aee Binary files /dev/null and b/public/images/favicon-96x96.png differ diff --git a/public/images/favicon.ico b/public/images/favicon.ico new file mode 100644 index 0000000..2055035 Binary files /dev/null and b/public/images/favicon.ico differ diff --git a/public/images/logo.png b/public/images/logo.png new file mode 100644 index 0000000..852884e Binary files /dev/null and b/public/images/logo.png differ diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index bd627db..d196c34 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -19,14 +19,14 @@ body { color: #CC7A98; } h1 { - font-family: "Gilroy"; } + font-family: "Gilroy", sans-serif; } h2 { font-weight: bold; - font-family: "Apercu Mono"; } + font-family: "Apercu Mono", monospace; } p { - font-family: "Apercu Mono"; } + font-family: "Apercu Mono", monospace; } a:hover { color: #CDE7B0; } @@ -39,7 +39,7 @@ article { header nav a span { font-size: 2rem; - font-family: 'Titling Gothic FB'; + font-family: 'Titling Gothic FB', sans-serif; color: #CC7A98; } header nav #navbarSupportedContent23 ul { @@ -51,7 +51,7 @@ header nav #navbarSupportedContent23 ul { header nav #navbarSupportedContent23 ul li a span { transition: 0.2s; color: #002234; - font-family: "Apercu Mono"; } + font-family: "Apercu Mono", monospace; } header nav #navbarSupportedContent23 ul li:hover { background-color: #002234; } header nav #navbarSupportedContent23 ul li:hover a span { @@ -154,7 +154,7 @@ footer { background: #CC7A98; } .ham span:nth-child(1) { - top: 0px; } + top: 0; } .ham span:nth-child(2), .ham span:nth-child(3) { top: 10px; } @@ -179,9 +179,9 @@ footer { -o-transform: rotate(-45deg); transform: rotate(-45deg); } -.ham.open span:nth-child(4) { +.ham.open span:nth-child(4)none { top: 11px; - width: 0%; + width: 0; left: 50%; } @media only screen and (max-width: 575px) { @@ -195,11 +195,13 @@ footer { margin-top: 5vh !important; } .ef { max-height: none !important; - min-height: none !important; } } + min-height: 0 !important; } + .ff { + min-height: 82.8vh !important; } } @media only screen and (max-height: 815px) { .ef { max-height: none !important; - min-height: none !important; } } + min-height: 0 !important; } } /*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/public/stylesheets/style.sass b/public/stylesheets/style.sass index 6db2373..e3207ab 100644 --- a/public/stylesheets/style.sass +++ b/public/stylesheets/style.sass @@ -23,14 +23,14 @@ body color: $pink h1 - font-family: "Gilroy" + font-family: "Gilroy", sans-serif h2 font-weight: bold - font-family: "Apercu Mono" + font-family: "Apercu Mono", monospace p - font-family: "Apercu Mono" + font-family: "Apercu Mono", monospace a:hover color: $green @@ -47,7 +47,7 @@ header a span font-size: 2rem - font-family: 'Titling Gothic FB' + font-family: 'Titling Gothic FB', sans-serif color: $pink #navbarSupportedContent23 @@ -61,7 +61,7 @@ header span transition: 0.2s color: $black - font-family: "Apercu Mono" + font-family: "Apercu Mono", monospace li:hover background-color: $black @@ -173,7 +173,7 @@ footer background: $pink .ham span:nth-child(1) - top: 0px + top: 0 .ham span:nth-child(2), .ham span:nth-child(3) top: 10px @@ -198,9 +198,9 @@ footer -o-transform: rotate(-45deg) transform: rotate(-45deg) -.ham.open span:nth-child(4) +.ham.open span:nth-child(4)none top: 11px - width: 0% + width: 0 left: 50% @@ -215,10 +215,12 @@ footer margin-top: 5vh !important .ef max-height: none !important - min-height: none !important + min-height: 0 !important + .ff + min-height: 82.8vh !important @media only screen and (max-height: 815px) .ef max-height: none !important - min-height: none !important + min-height: 0 !important diff --git a/views/about.pug b/views/about.pug index f883da8..8bf095d 100644 --- a/views/about.pug +++ b/views/about.pug @@ -2,7 +2,7 @@ extends layout block nav-links li.nav-item.active - a.nav-link(href='#') + a.nav-link(href='/') span Home li.nav-item a.nav-link(href='#') @@ -21,5 +21,7 @@ block nav-links span Contact block content - .container - p In development \ No newline at end of file + .container-fluid + .row + .col(style="padding-right: 10px;padding-left: 10px;") + p In development \ No newline at end of file diff --git a/views/error.pug b/views/error.pug index 72f2819..9d2a4a1 100644 --- a/views/error.pug +++ b/views/error.pug @@ -5,7 +5,7 @@ block nav-links a.nav-link(href='/') span Home li.nav-item - a.nav-link(href='#') + a.nav-link(href='/about') span About li.nav-item a.nav-link(href='#') @@ -21,7 +21,7 @@ block nav-links span Contact block content - .center-v-h.ef + .center-v-h.ef.ff .error h1= message #error-code diff --git a/views/index.pug b/views/index.pug index 0dbc6c3..fe83307 100644 --- a/views/index.pug +++ b/views/index.pug @@ -5,7 +5,7 @@ block nav-links a.nav-link(href='#') span Home li.nav-item - a.nav-link(href='#') + a.nav-link(href='/about') span About li.nav-item a.nav-link(href='#') diff --git a/views/layout.pug b/views/layout.pug index 6b00b3b..3f9c381 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -4,9 +4,13 @@ html meta(http-equiv="content-type" content="text/html; charset=UTF-8") meta(name="viewport" content="width=device-width, initial-scale=1") - title ESTR // #{title} + title ESTR. // #{title} meta(name="description" content=description) + link(rel='icon' type='image/png' sizes='32x32' href='/images/favicon-32x32.png') + link(rel='icon' type='image/png' sizes='96x96' href='/images/favicon-96x96.png') + link(rel='icon' type='image/png' sizes='16x16' href='/images/favicon-16x16.png') + link(rel='stylesheet', href='/stylesheets/bootstrap.css') link(rel='stylesheet', href='/stylesheets/style.css') body @@ -37,7 +41,7 @@ html p © 2020 | | | - a(href="/") ESTR// + a(href="/") ESTR. script(src="/javascript/jquery-3.5.1.min.js") script(src="/javascript/bootstrap.js")