diff --git a/shop/static/styles.css b/shop/static/styles.css index 40b02be4a5ba26ad67c324a66ded61a6ca0cc499..e7595a9263d9355b7dc0357217ce0a8939019c6e 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 367bed7b4591092f5fee9a391b2fa0d71546d49f..b280c830ddbebf212e44e0470ebfe596c3a982bc 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 5d74eb3eb2c8743b580145f5dc986646a6b40767..4f344a7874e4f8f4abdba8ea2b0eba0c76c6b446 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 22ea38515f0057d099199dc509ab16779389c87b..39ac5472e631f946b2b9188d0ed6020aa7020f06 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 bad9acd00ec3e563b0e3bf8af474581922b597f2..30c3c3b656525f827561f753600bbe4154a57b64 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 bfb405eda0e97a766d49a4f56f3ef33fe8571ceb..9e3717f6a3c74655b0dcccfcd4f0968430f4e288 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 648ee37413df0c8068df8a38a40568ac7efe91cb..774c8708e69589878221453f8ddf23a07146b797 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>