Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce

This commit is contained in:
CodeSteak 2020-01-12 18:01:37 +01:00
commit b46e4a8c73
4 changed files with 52 additions and 122 deletions

View File

@ -1,11 +1,11 @@
.articledetail {
max-width: 100%;
padding: 2em;
background-color: var(--root-c-secondary);
background-color: var(--c-primary);
}
.availability {
color: var(--c-primary);
color: var(--root-c-secondary);
}
.checkout {
@ -24,3 +24,7 @@
margin-bottom: 0px;
padding-left: 15px;
}
.checkout button {
background-color: var(--root-c-secondary);
}

View File

@ -5,7 +5,7 @@
.searchresults {
max-width: 100%;
padding: 2em;
background-color: var(--root-c-secondary);
background-color: var(--c-white);
border: 0px;
}
@ -17,7 +17,7 @@
}
.articlelist {
background-color: var(--root-c-secondary);
background-color: var(--c-white);
}
.article {
@ -34,12 +34,12 @@ h2 {
.articlelink {
color: var(--c-white);
background-color: var(--root-c-secondary);
background-color: var(--c-white);
border: 0px;
}
.articlelink:hover {
color: var(--c-primary)
color: var(--root-c-secondary)
}
h1 {

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="de" dir="ltr">
<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>e-commerce</title>
@ -8,24 +8,9 @@
<link href="/css/articleDetail.css" rel="stylesheet"/>
</head>
<body>
<nav class='hero'>
<div class='content-width flex'>
<h1>Project eCommerce</h1>
<button>Angebote</button>
<div class='spacer input-icon secondary'>
<input type="text" placeholder="Nach Produkten suchen..."/>
<form action="/searchresults" method="GET">
<button class='searchbutton' type="submit">Finden</button>
</form>
</div>
<form class="button" action="/login" method="GET">
<button type="submit">Login</button>
</form>
</div>
</nav>
<main>
<nav th:replace="fragments/header :: header">Header</nav>
<div class="hero">
<main>
<div class="articledetail">
<div class="row">
<div class="picture col-4">
@ -59,30 +44,8 @@
</div>
</div>
</div>
</div>
</main>
<footer class="hero-black">
<div class='content-width flex'>
<h3>Project eCommerce</h3>
<div class="spacer"></div>
<div>
<h4>Seite</h4>
<ul>
<li><a>Login</a></li>
<li><a>Angebote</a></li>
<li><a>Suche</a></li>
<li><a>Mitarbeiter Login</a></li>
</ul>
</div>
<div>
<h4>Mehr</h4>
<ul>
<li><a>Nutzungsbedingungen</a></li>
<li><a>Datenschutz</a></li>
<li><a>Über</a></li>
</ul>
</div>
</div>
</footer>
<footer th:replace="fragments/footer :: footer"></footer>
</body>
</html>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="de" dir="ltr">
<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>e-commerce</title>
@ -8,22 +8,7 @@
<link href="/css/searchResults.css" rel="stylesheet"/>
</head>
<body>
<nav class='hero'>
<div class='content-width flex'>
<h1>Project eCommerce</h1>
<button>Angebote</button>
<div class='spacer input-icon secondary'>
<input type="text" placeholder="Nach Produkten suchen..."/>
<form action="/searchresults" method="GET">
<button class='searchbutton' type="submit">Finden</button>
</form>
</div>
<form class="button" action="/login" method="GET">
<button type="submit">Login</button>
</form>
</div>
</nav>
<nav th:replace="fragments/header :: header">Header</nav>
<main>
<div class="hero">
<div class="searchresults">
@ -46,7 +31,7 @@
</div>
<div class="col-9 articledesc">
<h2>
<form action="/articledetail" method="GET">
<form action="/articleDetail" method="GET">
<input type="submit" value="Tolle Kamera" class="articlelink">
</form>
</h2>
@ -66,7 +51,7 @@
</div>
<div class="col-9 articledesc">
<h2>
<form action="/articledetail" method="GET">
<form action="/articleDetail" method="GET">
<input type="submit" value="Bluetooth Kopfhörer" class="articlelink">
</form>
</h2>
@ -83,7 +68,7 @@
</div>
<div class="col-9 articledesc">
<h2>
<form action="/articledetail" method="GET">
<form action="/articleDetail" method="GET">
<input type="submit" value="???" class="articlelink">
</form>
</h2>
@ -99,28 +84,6 @@
</div>
</div>
</main>
<footer class="hero-black">
<div class='content-width flex'>
<h3>Project eCommerce</h3>
<div class="spacer"></div>
<div>
<h4>Seite</h4>
<ul>
<li><a>Login</a></li>
<li><a>Angebote</a></li>
<li><a>Suche</a></li>
<li><a>Mitarbeiter Login</a></li>
</ul>
</div>
<div>
<h4>Mehr</h4>
<ul>
<li><a>Nutzungsbedingungen</a></li>
<li><a>Datenschutz</a></li>
<li><a>Über</a></li>
</ul>
</div>
</div>
</footer>
<footer th:replace="fragments/footer :: footer"></footer>
</body>
</html>