From 016f56f7004bf9bc37261da67822e20d76179215 Mon Sep 17 00:00:00 2001
From: Michael Drury <mpdrury15@gmail.com>
Date: Wed, 10 May 2023 14:22:52 +0100
Subject: [PATCH] made all buttons same
---
shop/static/styles.css | 18 ++++--------------
shop/templates/cart.html | 14 +++++++-------
shop/templates/checkout.html | 2 +-
shop/templates/login.html | 2 +-
shop/templates/shopping.html | 8 ++++----
shop/templates/signup.html | 2 +-
shop/templates/wishlist.html | 2 +-
7 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/shop/static/styles.css b/shop/static/styles.css
index 40b02be..e7595a9 100644
--- a/shop/static/styles.css
+++ b/shop/static/styles.css
@@ -302,18 +302,10 @@ li {
transform: scale(1.1);
}
-.item_cart_name {
- font-size: 200%;
- color: black;
- font-family: Andale Mono, monospace;
-}
-
-.item_cart_name:hover {
- font-size: 220%;
-}
.total_price {
padding-left: 2%;
+ font-size: 1vw;
}
.cart_welcome {
@@ -390,8 +382,6 @@ li {
font-size: 150%;
}
-
-
.login_field {
font-size: 1.5vw;
}
@@ -539,7 +529,7 @@ li {
.slogan {
text-align: center;
- font-size: 130%;
+ font-size: 2vw;
}
.item_page_side {
@@ -575,14 +565,14 @@ li {
margin: 0px;
}
-.add_to_button {
+.orange_button {
color: black;
border: 2px solid grey;
background-color: lightgrey;
border-radius: 5px;
}
-.add_to_button:hover {
+.orange_button:hover {
color: #D49B30;
background-color: lightgrey;
}
diff --git a/shop/templates/cart.html b/shop/templates/cart.html
index 367bed7..b280c83 100644
--- a/shop/templates/cart.html
+++ b/shop/templates/cart.html
@@ -12,11 +12,11 @@
<div class = "remove_form">
<form method="POST">
{{ remove_form.csrf_token }}
- <p>
- {{ remove_form.item_id_remove.label }} {{ remove_form.item_id_remove(class = "field_order_by") }}
+ <p class = "login_field">
+ {{ remove_form.item_id_remove.label }} {{ remove_form.item_id_remove(class = "input_field") }}
</p>
- <p>
- clear all? {{ remove_form.clear_all }} {{ remove_form.submit(class = "field_order_by") }}
+ <p class = "login_field">
+ clear all? {{ remove_form.clear_all }} {{ remove_form.submit(class = "orange_button") }}
</p>
</form>
</div>
@@ -52,9 +52,9 @@
<div class = "cart_box" >
<a href="/item?id={{item.product_id}}">
<img class = "item_cart_img" src = "{{ url_for('static', filename='images/' + item.product_image) }}" alt="background image"/></a>
- <p><a class = "item_cart_name" href="/item?id={{item.product_id}}"><b>{{ item.product_name }}</b></a></p>
- <p>price: £{{ '{:,.2f}'.format(item.product_price) }}</p>
- <p>item id: {{ item.product_id }}</p>
+ <p><a class = "item_shopping_name" href="/item?id={{item.product_id}}"><b>{{ item.product_name }}</b></a></p>
+ <p class = "shopping_item_text">price: £{{ '{:,.2f}'.format(item.product_price) }}</p>
+ <p class = "shopping_item_text">item id: {{ item.product_id }}</p>
</div>
{% endfor %}
diff --git a/shop/templates/checkout.html b/shop/templates/checkout.html
index 5d74eb3..4f344a7 100644
--- a/shop/templates/checkout.html
+++ b/shop/templates/checkout.html
@@ -42,7 +42,7 @@
</p>
<p class="hiden3">please enter expiery date in form month / yvear</p>
<p class = "checkout_line">
- {{ form.submit(class = "add_to_button") }}
+ {{ form.submit(class = "orange_button") }}
</p>
</div>
</form>
diff --git a/shop/templates/login.html b/shop/templates/login.html
index 22ea385..39ac547 100644
--- a/shop/templates/login.html
+++ b/shop/templates/login.html
@@ -16,7 +16,7 @@
{{ form.password.label }} {{ form.password(class = "input_field") }}
</p>
<p class="login_field">
- {{ form.submit(class = "input_field") }}
+ {{ form.submit(class = "orange_button") }}
</p>
</div>
</form>
diff --git a/shop/templates/shopping.html b/shop/templates/shopping.html
index bad9acd..30c3c3b 100644
--- a/shop/templates/shopping.html
+++ b/shop/templates/shopping.html
@@ -14,7 +14,7 @@
<div class = "shopping_right_text">
{{ order_by_form.csrf_token }}
<p>
- {{ order_by_form.order.label }} {{ order_by_form.order(class = "field_order_by") }} {{ order_by_form.submit(class = "add_to_button") }}
+ {{ order_by_form.order.label }} {{ order_by_form.order(class = "field_order_by") }} {{ order_by_form.submit(class = "orange_button") }}
</p>
</div>
</form>
@@ -23,7 +23,7 @@
<div class = "shopping_right_text">
{{ type_form.csrf_token }}
<p>
- {{ type_form.type.label }} {{ type_form.type(class = "field_order_by") }} {{ type_form.submit1(class = "add_to_button") }}
+ {{ type_form.type.label }} {{ type_form.type(class = "field_order_by") }} {{ type_form.submit1(class = "orange_button") }}
</p>
</div>
</form>
@@ -74,11 +74,11 @@
{% if current_user.is_authenticated %}
<form method = "post">
<input type = "hidden" name = "item_id_cart" value = {{ item.product_id }}>
- <input class = "add_to_button" type = "submit" value = "add to cart">
+ <input class = "orange_button" type = "submit" value = "add to cart">
</form>
<form method = "post" style = "padding-top: 10px">
<input type = "hidden" name = "item_id_wishlist" value = {{ item.product_id }}>
- <input class = "add_to_button" type = "submit" value = "add to wishlist">
+ <input class = "orange_button" type = "submit" value = "add to wishlist">
</form>
{% endif %}
{% if not current_user.is_authenticated %}
diff --git a/shop/templates/signup.html b/shop/templates/signup.html
index bfb405e..9e3717f 100644
--- a/shop/templates/signup.html
+++ b/shop/templates/signup.html
@@ -39,7 +39,7 @@
{{ form.verifyPassword.label }} {{ form.verifyPassword(class = "input_field") }}
</p>
<p class="login_field">
- {{ form.submit() }}
+ {{ form.submit(class = "orange_button") }}
</p>
</div>
</form>
diff --git a/shop/templates/wishlist.html b/shop/templates/wishlist.html
index 648ee37..774c870 100644
--- a/shop/templates/wishlist.html
+++ b/shop/templates/wishlist.html
@@ -18,7 +18,7 @@
{{ remove_form.item_id_remove.label }} {{ remove_form.item_id_remove(class = "field_order_by") }}
</p>
<p>
- clear all? {{ remove_form.clear_all }} {{ remove_form.submit(class = "field_order_by") }}
+ clear all? {{ remove_form.clear_all }} {{ remove_form.submit(class = "orange_button") }}
</p>
</form>
</div>
--
GitLab