diff --git a/run.py b/run.py
index d54c4934b770bb88e448752993837c2953cc801d..83d471c8a901093eb815e17ef953a61f2cb59550 100644
--- a/run.py
+++ b/run.py
@@ -25,7 +25,7 @@ if __name__ == '__main__':
if product_table.query.filter_by(product_name='Kona Process 153').first() is None:
product_table.new_product('Kona Process 153', 1749.00, 2.3, 'process_153_frame.jpg', 'vitus', 'frame','A strong and agile aluminum MTB frame for trail riding' )
if product_table.query.filter_by(product_name='Santa Cruz Hightower').first() is None:
- product_table.new_product('Santa Cruz Hightower', 3599.00, 2.2, 'SC_Hightower_frame.png', 'santa cruz', 'frame', 'A top-tier carbon fiber frame for all-mountain riding')
+ product_table.new_product('Santa Cruz Hightower', 3599.00, 2.2, 'SC_Hightower_frame.jpg', 'santa cruz', 'frame', 'A top-tier carbon fiber frame for all-mountain riding')
if product_table.query.filter_by(product_name='Yeti SB165').first() is None:
product_table.new_product('Yeti SB165', 2933.24, 2.1, 'SB165_frame.jpg', 'yeti', 'frame', 'A high-end carbon fiber frame for aggressive enduro riding')
app.run(debug = True)
\ No newline at end of file
diff --git a/shop/static/images/SC_Hightower_frame.jpg b/shop/static/images/SC_Hightower_frame.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e0fd2d48ad6d6bd2e3b4d1f986ec9fd8bc654a70
Binary files /dev/null and b/shop/static/images/SC_Hightower_frame.jpg differ
diff --git a/shop/static/images/SC_Hightower_frame.png b/shop/static/images/SC_Hightower_frame.png
deleted file mode 100644
index f7e56ae9bac3f4761d55857ba982f23602fc4160..0000000000000000000000000000000000000000
Binary files a/shop/static/images/SC_Hightower_frame.png and /dev/null differ
diff --git a/shop/static/images/fox34.jpg b/shop/static/images/fox34.jpg
index f8401fa8868662ab96f37b6966f498363cfc82c3..135ed9feb0617c69104b98c35ae27ab9cee4da3b 100644
Binary files a/shop/static/images/fox34.jpg and b/shop/static/images/fox34.jpg differ
diff --git a/shop/static/images/fox36.jpg b/shop/static/images/fox36.jpg
index fa6db5a8a7ba2a612846236bf1f821ec4d941003..ee5406e66a175206aa538a82766eaa851074b76e 100644
Binary files a/shop/static/images/fox36.jpg and b/shop/static/images/fox36.jpg differ
diff --git a/shop/static/images/pike.jpg b/shop/static/images/pike.jpg
index 04ecf4f52794195a2208f9b22a7ed2bbf631f174..047be245a3285050ccef5ddf6e3c63f03991ae1a 100644
Binary files a/shop/static/images/pike.jpg and b/shop/static/images/pike.jpg differ
diff --git a/shop/static/images/process_153_frame.jpg b/shop/static/images/process_153_frame.jpg
index 94cf16dbbbaff3d2ed8a3780f75865f009bbcc32..292ec5b896e6a21850556384d17e6c71f123eae6 100644
Binary files a/shop/static/images/process_153_frame.jpg and b/shop/static/images/process_153_frame.jpg differ
diff --git a/shop/static/images/suntor.jpg b/shop/static/images/suntor.jpg
index 90a1cb62202c2a8e265aa15404fedcd0ba7d1426..ac17baef324d3f6e7707ad2a52ef0a15286113fc 100644
Binary files a/shop/static/images/suntor.jpg and b/shop/static/images/suntor.jpg differ
diff --git a/shop/static/images/yari.jpg b/shop/static/images/yari.jpg
index 9f799652ee0dd6a626da762e62c10ee611dd215c..b81620ff40e1cd8f1d7c2c256e18a43579d292b9 100644
Binary files a/shop/static/images/yari.jpg and b/shop/static/images/yari.jpg differ
diff --git a/shop/static/styles.css b/shop/static/styles.css
index ac520b23533c1b282087a350404cc705b43ff687..f543afdd311424cb99c08f0adc03e17f67861bbc 100644
--- a/shop/static/styles.css
+++ b/shop/static/styles.css
@@ -113,7 +113,7 @@ a:link {
margin-left: 2%;
margin-bottom: 20px;
padding: 10px;
- height: 250px
+ height: 250px;
}
.item_shopping_block:hover {
@@ -152,19 +152,6 @@ a:link {
margin-bottom: 10px;
}
-.navbar_box_home {
- height: 70px;
- width: 200px;
- margin-top: 10px;
- margin-bottom: 10px;
- margin-left: 20px;
-}
-
-.navbar_box_home:hover {
- border-left: 1px solid grey;
- border-right: 1px solid grey;
-}
-
.navbar_box:hover {
border-left: 1px solid grey;
border-right: 1px solid grey;
@@ -199,11 +186,6 @@ li {
@media only screen and (max-width: 1300px) {
- .navbar_box_home {
- width: 150px;
- height: 60px;
- }
-
.navbar_box {
width: 150px;
height: 60px;
@@ -217,11 +199,6 @@ li {
@media only screen and (max-width: 950px) {
- .navbar_box_home {
- width: 130px;
- height: 50px;
- }
-
.navbar_box {
width: 130px;
height: 50px;
@@ -235,16 +212,16 @@ li {
@media only screen and (max-width: 820px) {
- .navbar_box_home {
+ .navbar_box {
width: 100px;
height: 40px;
}
- .navbar_box {
- width: 100px;
- height: 40px;
+ .item_shopping_block{
+ height: 150px;
}
+
.navbar_item {
font-size: 100%;
}
@@ -253,13 +230,8 @@ li {
@media only screen and (max-width: 650px) {
- .navbar_box_home {
- width: 78px;
- height: 30px;
- }
-
.navbar_box {
- width: 78px;
+ width: 75px;
height: 30px;
}
diff --git a/shop/templates/layout.html b/shop/templates/layout.html
index 4028adecbed6add4f8b868b5bb38c5c45b77fd31..fa9c938c20acce7f0c60c4d91f86d76d9f0e7412 100644
--- a/shop/templates/layout.html
+++ b/shop/templates/layout.html
@@ -19,7 +19,7 @@
</div>
<ul class = "navbar">
- <li><div class = "navbar_box_home"><a class = "navbar_item" href="{{ url_for('home') }}">Home</a></div></li>
+ <li style = "margin-left: 10px"><div class = "navbar_box"><a class = "navbar_item" href="{{ url_for('home') }}">Home</a></div></li>
<li><div class = "navbar_box"><a class = "navbar_item" href="{{ url_for('shopping') }}">Shopping</a></div></li>
<li><div class = "navbar_box"><a class = "navbar_item" href="{{ url_for('cart') }}">Cart</a></div></li>
<li><div class = "navbar_box"><a class = "navbar_item" href="{{ url_for('wishlist') }}">Wishlist</a></div></li>