From 5223f8f10953b7636f45d69acda542589f3f3f5c Mon Sep 17 00:00:00 2001
From: "Benjamin.sitbon" <benjamin.sitbon@etu.hesge.ch>
Date: Sun, 9 May 2021 19:22:03 +0200
Subject: [PATCH] ajustement graphique
---
frontend/cart.css | 8 ++++++--
frontend/cart.html | 3 ++-
frontend/checkout.css | 11 ++++++++++-
frontend/checkout.html | 9 +++++----
frontend/js/index.js | 9 +--------
frontend/js/product.js | 9 +--------
frontend/js/slider.js | 0
frontend/js/val.js | 8 ++++++++
frontend/menu.css | 2 +-
frontend/select.html | 3 ++-
frontend/shop.html | 1 +
11 files changed, 37 insertions(+), 26 deletions(-)
delete mode 100644 frontend/js/slider.js
create mode 100644 frontend/js/val.js
diff --git a/frontend/cart.css b/frontend/cart.css
index 5df317a..0059d9d 100644
--- a/frontend/cart.css
+++ b/frontend/cart.css
@@ -87,8 +87,8 @@ main{
#checkout {
- width: 20vw;
- height: 7.5vh;
+ width: 15vw;
+ height: 7vh;
border: none;
color: white;
border-radius: 20px;
@@ -99,6 +99,10 @@ main{
transform: translateX(-50%);
margin-bottom: 5vh;
margin-top: 5vh;
+ cursor: pointer;
+ font-size: 2.25vw;
+ text-align: center;
+ text-decoration: none;
}
diff --git a/frontend/cart.html b/frontend/cart.html
index fc6d3b1..cc08d42 100644
--- a/frontend/cart.html
+++ b/frontend/cart.html
@@ -30,13 +30,14 @@
<div id="container">
</div>
- <button id="checkout">Check-Out</button>
+ <a href="checkout.html" id="checkout">Check-Out</a>
</main>
<script src="js/bag.js"></script>
+
</body>
</html>
\ No newline at end of file
diff --git a/frontend/checkout.css b/frontend/checkout.css
index 3d77fa5..7289575 100644
--- a/frontend/checkout.css
+++ b/frontend/checkout.css
@@ -13,7 +13,7 @@ label {
}
.euladiv + label{
- display: block
+ display: block;
padding-left: 15px;
text-indent: -15px;
}
@@ -57,6 +57,15 @@ input[type=submit] {
clear: both;
}
+input[type=submit]{
+ color: white;
+ border-radius: 20px;
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+ background-color: rgba(255,27,0,1);
+ border: none;
+ cursor: pointer;
+}
+
@media screen and (max-width: 600px) {
.col-25, .col-75, input[type=submit]{
width: 100%;
diff --git a/frontend/checkout.html b/frontend/checkout.html
index 7b0fdaf..0973df9 100644
--- a/frontend/checkout.html
+++ b/frontend/checkout.html
@@ -8,14 +8,14 @@
<!-- <link rel="stylesheet" href="style.css"> -->
<link rel="stylesheet" href="menu.css">
<link rel="stylesheet" href="checkout.css">
- <!-- <link rel="stylesheet" href="button.css"> -->
+ <link rel="stylesheet" href="button.css">
<title>Checkout</title>
</head>
<body>
<nav>
<div class="shop">
- <a href="shop.html" id="back">BACK TO MENU</a>
+ <a href="shop.html" id="back">SHOP</a>
</div>
<p id="fill">CHECKOUT</p>
@@ -105,7 +105,7 @@
<div class="col-75">
<div class="euladiv">
<label for="eula"> <input type="checkbox" name="eula" placeholder="false"> I have read and agreed to the terms and conditions </label>
- <input type="submit" placeholder="envoyer">
+ <input type="submit" placeholder="envoyer" >
</div>
</div>
</div>
@@ -114,7 +114,8 @@
</div>
</main>
-
+
+ <script src="js/val.js"></script>
<footer>
diff --git a/frontend/js/index.js b/frontend/js/index.js
index c934943..8db0779 100644
--- a/frontend/js/index.js
+++ b/frontend/js/index.js
@@ -213,14 +213,7 @@
pokedex(0,20);
- if(localStorage.length > 0){
- let after = document.createElement("p");
- after.className = "after";
- after.innerHTML = localStorage.length -1;
-
- let bag = document.getElementById("sac");
- bag.after(after);
- }
+
for(let i =0; i<localStorage.length; i++){
diff --git a/frontend/js/product.js b/frontend/js/product.js
index d0c800e..8d2bcab 100644
--- a/frontend/js/product.js
+++ b/frontend/js/product.js
@@ -387,14 +387,7 @@
}
gotSelect();
- if(localStorage.length > 0){
- let after = document.createElement("p");
- after.className = "after";
- after.innerHTML = localStorage.length -1;
-
- let bag = document.getElementById("sac");
- bag.after(after);
- }
+
for(let i =0; i<localStorage.length; i++){
diff --git a/frontend/js/slider.js b/frontend/js/slider.js
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/js/val.js b/frontend/js/val.js
new file mode 100644
index 0000000..018f4de
--- /dev/null
+++ b/frontend/js/val.js
@@ -0,0 +1,8 @@
+if(localStorage.length > 0){
+ let after = document.createElement("p");
+ after.className = "after";
+ after.innerHTML = localStorage.length -1;
+
+ let bag = document.getElementById("sac");
+ bag.after(after);
+}
\ No newline at end of file
diff --git a/frontend/menu.css b/frontend/menu.css
index e5191dc..777c80b 100644
--- a/frontend/menu.css
+++ b/frontend/menu.css
@@ -141,7 +141,7 @@ nav {
position: absolute;
top: 0;
left: 10%;
- width: 13vw;
+ width: 11vw;
height: 1.75vw;
margin-top: 6.5vh;
text-align: center;
diff --git a/frontend/select.html b/frontend/select.html
index a3580ca..e218487 100644
--- a/frontend/select.html
+++ b/frontend/select.html
@@ -25,7 +25,7 @@
<div id="sac">
- <img src="img/sac.svg" id="logo">
+ <a href="cart.html"><img src="img/sac.svg" id="logo"></a>
</div>
</div>
@@ -44,6 +44,7 @@
<script src="js/product.js"></script>
+ <script src="js/val.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/frontend/shop.html b/frontend/shop.html
index ba87709..f7b3dfb 100644
--- a/frontend/shop.html
+++ b/frontend/shop.html
@@ -49,6 +49,7 @@
</footer>
<script src="js/index.js"></script>
+ <script src="js/val.js"></script>
</body>
</html>
\ No newline at end of file
--
GitLab