diff --git a/src/dashboard/templates/dashboard/order_detail.html b/src/dashboard/templates/dashboard/order_detail.html
index e720a18..be1a2de 100644
--- a/src/dashboard/templates/dashboard/order_detail.html
+++ b/src/dashboard/templates/dashboard/order_detail.html
@@ -29,7 +29,7 @@
{% with product=item.product %}
{{product.name}} {{product.name}}
{{product.sku}}
{{item.quantity}}
diff --git a/src/media/products/images/coffee.jpg b/src/media/products/images/coffee.jpg
deleted file mode 100644
index 545e3d7..0000000
Binary files a/src/media/products/images/coffee.jpg and /dev/null differ
diff --git a/src/media/products/images/coffee_02.jpg b/src/media/products/images/coffee_02.jpg
deleted file mode 100644
index 1f55562..0000000
Binary files a/src/media/products/images/coffee_02.jpg and /dev/null differ
diff --git a/src/media/products/images/coffee_05.jpg b/src/media/products/images/coffee_05.jpg
deleted file mode 100644
index 2285280..0000000
Binary files a/src/media/products/images/coffee_05.jpg and /dev/null differ
diff --git a/src/ptcoffee/settings.py b/src/ptcoffee/settings.py
index aae9912..dd462df 100644
--- a/src/ptcoffee/settings.py
+++ b/src/ptcoffee/settings.py
@@ -9,6 +9,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent
# Add Your Required Allow Host
if DEBUG == False:
ALLOWED_HOSTS = ['ptcoffee-dev.windmillapps.org']
+else:
+ ALLOWED_HOSTS = ['192.168.68.106', '127.0.0.1', 'localhost']
INTERNAL_IPS = [
'127.0.0.1',
diff --git a/src/static/images/fair_trade_stamp.png b/src/static/images/fair_trade_stamp.png
index 9bc0f2e..d41c7dc 100644
Binary files a/src/static/images/fair_trade_stamp.png and b/src/static/images/fair_trade_stamp.png differ
diff --git a/src/static/scripts/payment.js b/src/static/scripts/payment.js
index 1ba1e47..1c3345f 100644
--- a/src/static/scripts/payment.js
+++ b/src/static/scripts/payment.js
@@ -1,6 +1,6 @@
import { getCookie } from "./cookie.js"
-let form = document.querySelector('form.order__form')
+let form = document.querySelector('form')
// Render the PayPal button into #paypal-button-container
paypal.Buttons({
diff --git a/src/static/scripts/product_gallery.js b/src/static/scripts/product_gallery.js
new file mode 100644
index 0000000..eecc3bd
--- /dev/null
+++ b/src/static/scripts/product_gallery.js
@@ -0,0 +1,12 @@
+const gallery = document.querySelectorAll('.gallery__thumbnail')
+const productImage = document.querySelector('.product__image')
+let currentImg = document.querySelector('.gallery__thumbnail--focus')
+
+gallery.forEach(image => {
+ image.addEventListener('mouseover', event => {
+ currentImg.classList.remove('gallery__thumbnail--focus')
+ event.target.classList.add('gallery__thumbnail--focus')
+ currentImg = event.target
+ productImage.src = currentImg.src
+ })
+})
diff --git a/src/static/styles/main.css b/src/static/styles/main.css
index ab1aea1..b9990eb 100644
--- a/src/static/styles/main.css
+++ b/src/static/styles/main.css
@@ -1,9 +1,11 @@
:root {
--fg-color: #34201A;
--bg-color: #f5f5f5;
+ --bg-alt-color: #eee5d3;
--gray-color: #9d9d9d;
--yellow-color: #f8a911;
--yellow-alt-color: #ffce6f;
+ --yellow-dark-color: #b27606;
--default-border: 2px solid var(--gray-color);
}
@@ -13,17 +15,22 @@ html {
}
body {
- background: var(--bg-color);
+ background-color: var(--bg-color);
font-family: 'Inter', sans-serif;
font-weight: 400;
- max-width: 1024px;
- padding: 1rem;
+ padding: 0;
margin: 0 auto;
line-height: 1.75;
color: var(--fg-color);
}
+
+/* ==========================================================================
+ Typography
+ ========================================================================== */
+
p {
+ margin-top: 0;
margin-bottom: 1rem;
}
@@ -35,6 +42,7 @@ h1, h2, h3, h4, h5 {
margin: 0;
font-weight: 700;
line-height: 1.3;
+ margin-bottom: 1rem;
}
h1 {
@@ -58,7 +66,7 @@ h5 {
font-size: 1.2rem;
}
-small, .text_small {
+small, .text-small {
font-size: 0.833rem;
}
@@ -67,56 +75,52 @@ small, .text_small {
}
-
-
-
-
-
-
-button,
-input,
-optgroup,
-select,
-textarea {
- color: inherit;
+/* ==========================================================================
+ Tables
+ ========================================================================== */
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
font: inherit;
- margin: 0;
- max-width: 100%;
- box-sizing: border-box;
+ width: 100%;
+ margin-bottom: 1rem;
+ border: 1px solid var(--gray-color);
}
-input {
- outline: 0;
-}
-
-
-
-label {
- display: block;
+td,
+th {
+ font: inherit;
text-align: left;
- font-weight: 700;
+ font-size: 0.85em;
+ padding: 2px 10px;
+ border-bottom: 1px solid;
+ border-color: var(--gray-color);
}
-select {
- text-align: left;
- border: var(--default-border);
- padding: 0.5em;
- outline: 0;
+th {
+ font-weight: bold;
}
+table a {
+ white-space: normal;
+}
+
+
+/* ==========================================================================
+ Forms
+ ========================================================================== */
input[type=text],
input[type=email],
input[type=number],
input[type=date],
input[type=password],
-select[multiple=multiple],
+select,
textarea {
- display: block;
- text-align: left;
color: var(--fg-color);
border: var(--default-border);
padding: 0.5rem;
outline: 0;
+ box-sizing: border-box;
}
input:focus,
@@ -125,7 +129,7 @@ textarea:focus {
}
select[multiple=multiple] {
- height: 125px;
+ height: 8rem;
}
@@ -145,7 +149,6 @@ input[type=checkbox] + label {
textarea {
width: 100%;
height: 6.25rem;
- line-height: 1.45;
}
::-webkit-input-placeholder {
@@ -159,36 +162,36 @@ textarea {
}
-.action-button,
+button,
input[type=submit],
-button {
+.action-button {
font-family: inherit;
font-weight: bold;
- font-size: 1rem;
- color: var(--fg-color);
+ font-size: 1.5rem;
text-decoration: none;
text-transform: lowercase;
font-variant: small-caps;
+ white-space: nowrap;
+
+ color: var(--fg-color);
background-color: var(--yellow-color);
+
padding: 0.25rem 1rem;
border-radius: 0.2rem;
border: none;
+
cursor: pointer;
}
+button,
+input[type=submit]:hover,
.action-button:hover {
background-color: var(--yellow-alt-color);
}
-.action-button--large {
- font-size: 2rem;
-}
-form input,
-form select {
- width: 100%;
- box-sizing: border-box;
-}
+
+
@@ -203,10 +206,21 @@ img {
}
+/* ==========================================================================
+ Base Layout
+ ========================================================================== */
+.site__header > nav,
+main > article,
+footer > section {
+ max-width: 1024px;
+ padding: 1rem;
+ margin: 0 auto;
+}
-
-/* MODAL MENU */
+/* ==========================================================================
+ Modal
+ ========================================================================== */
.modal-menu {
display: none;
position: fixed; /* Stay in place */
@@ -222,16 +236,13 @@ img {
/* Modal Content/Box */
.modal-menu__content {
- background-color: #fefefe;
+ background-color: var(--bg-color);
margin: 25vh auto;
padding: 20px;
- border: 1px solid #888;
+ border: var(--default-border);
max-width: 40rem;
}
-.modal-menu__form {
-
-}
.modal-menu__header {
display: flex;
@@ -249,118 +260,126 @@ img {
.close-modal:hover,
.close-modal:focus {
- color: black;
+ color: var(--fg-color);
text-decoration: none;
cursor: pointer;
}
-
-.fair_trade--small {
- max-width: 4rem;
- vertical-align: middle;
+/* ==========================================================================
+ Site
+ ========================================================================== */
+.site__ft-stamp {
+ max-width: 6rem;
}
-.product__item {
- display: grid;
- grid-template-columns: 2fr 1fr;
- gap: 0 2rem;
+/* Site Header
+ ========================================================================== */
+.site__header {
+ background-color: var(--bg-alt-color);
}
-@media (max-width: 876px) {
- .product__item {
- grid-template-columns: 1fr;
+.site__logo > img {
+ height: 4rem;
+}
+
+/* Site Nav
+ ========================================================================== */
+
+.site__nav {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.site__logo,
+.nav__main,
+.nav__account {
+ margin-right: 1rem;
+}
+
+@media screen and (max-width: 900px) {
+ .site__logo,
+ .nav__main,
+ .nav__account {
+ margin-right: 0;
+ }
+ .site__nav {
+ display: grid;
+ grid-template-columns: 2fr 0.5fr 0.5fr;
+ gap: 1rem;
+ }
+ .site__logo {
+ grid-column: 1;
+ }
+ .nav__main {
+ grid-column: 1/4;
+ grid-row: 2;
+ justify-content: space-between;
+ }
+ .nav__account {
+ grid-column: 2;
+ grid-row: 1;
+ }
+ .site__cart {
+ grid-column: 3;
+ grid-row: 1;
}
}
-.product__list-item button {
- grid-column: 1/3;
- align-self: end;
+@media screen and (max-width: 400px) {
+ .site__nav {
+ grid-template-columns: repeat(2, 1fr);
+ }
+ .site__logo {
+ grid-column: span 2;
+ justify-self: center;
+ }
+ .nav__main {
+ grid-column: 1/3;
+ grid-row: 3;
+ }
+ .nav__account {
+ grid-column: 1;
+ grid-row: 2;
+ }
+ .site__cart {
+ grid-column: 2;
+ grid-row: 2;
+ }
}
-
-
-.product__image {
- /*object-fit: cover;*/
- max-width: 100%;
-}
-
-.product__form {
- display: grid;
- grid-template-columns: 1fr 1fr 1fr;
- gap: 1rem;
-}
-
-.product__form input[type=submit] {
- /*grid-column: 2;*/
- justify-self: end;
-}
-
-.site-logo {
- height: 4rem;
- vertical-align: middle;
-}
-
-.site__header div,
-.site__header nav {
- display: flex;
- justify-content: space-between;
- align-items: baseline;
-}
-
-@media (max-width: 911px) {
- .site__header div {
- flex-direction: column;
- justify-content: center;
- }
-}
-
-nav a {
- text-transform: lowercase;
- font-variant: small-caps;
- font-weight: bold;
- text-decoration: none;
-}
-
-nav a:not(:last-child) {
- margin-right: 2rem;
-}
-
-nav {
- margin-bottom: 4rem;
-}
-
-.has-menu {
- position: relative;
-}
-
-.has-menu a {
- text-transform: lowercase;
- font-variant: small-caps;
- font-weight: bold;
- text-decoration: none;
-}
-
-.has-menu:hover .dropdown-menu {
- display: unset;
-}
-
-[role="menu"] {
+.nav__list {
list-style: none;
margin: 0;
padding: 0;
+ display: flex;
}
-[role="menuitem"] {
- cursor: pointer;
- position: relative;
-}
-[role="menuitem"]:not(:last-child) {
- margin-bottom: 0.5rem;
-
+.nav__menu {
+ position: relative;
}
-.dropdown-menu {
+.nav__link {
+ text-transform: lowercase;
+ font-variant: small-caps;
+ font-weight: bold;
+ text-decoration: none;
+ white-space: nowrap;
+}
+
+.nav__list li:not(:last-child) {
+ margin-right: 1rem;
+}
+
+.nav__list.menu {
+ flex-direction: column;
+}
+
+.nav__dropdown {
+ list-style: none;
+ margin: 0;
+ padding: 0;
background-color: var(--bg-color);
border: var(--default-border);
padding: 0.5rem;
@@ -371,220 +390,293 @@ nav {
display: none;
}
-.site__copyright {
- text-align: center;
-}
-
-.keep_calm {
- display: grid;
- grid-template-columns: 1fr 2fr;
- gap: 2rem;
-}
-
-.keep_calm__img {
- max-width: 250px;
-}
-
-@media (max-width: 564px) {
- .keep_calm {
- grid-template-columns: 1fr;
- }
- .keep_calm figure {
- text-align: center;
+@media screen and (max-width: 400px) {
+ .nav__dropdown {
+ left: 0;
+ right: unset;
}
}
+.nav__menu:hover .nav__dropdown {
+ display: flex;
+ flex-direction: column;
+}
+/* Site Cart
+ ========================================================================== */
.site__cart {
display: flex;
+ justify-content: center;
align-items: center;
- background-color: var(--yellow-color);
- padding: 0 1rem;
+
+ justify-self: end;
+
+ font-family: inherit;
+ font-weight: bold;
text-decoration: none;
- border-radius: 0.2rem;
+ text-transform: lowercase;
+ font-variant: small-caps;
+
color: var(--fg-color);
+ background-color: var(--yellow-color);
+ padding: 0.25rem 1rem;
+ border-radius: 0.2rem;
cursor: pointer;
- margin-left: 2rem;
}
+.cart__count {
+ font-size: 1rem;
+}
.cart__icon {
- width: 2rem;
height: 2rem;
}
-.cart__length {
- font-size: 1.5rem;
- font-weight: bold;
- font-family: 'Inter', sans-serif;
+
+/* ==========================================================================
+ Articles
+ ========================================================================== */
+article > header {
+ margin-bottom: 1rem;
}
-.cart__item {
+/* Products
+ ========================================================================== */
+.product__list {
display: grid;
- grid-template-columns: 1fr 1.5fr;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 4rem;
+}
+
+.product__item {
+ text-decoration: none;
+
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
gap: 1rem;
- padding: 2rem 0;
- border-bottom: 0.05rem solid var(--gray-color);
}
-.cart__item:last-child {
+.product__item h3 {
+ text-decoration: underline;
+}
+
+@media screen and (max-width: 900px) {
+ .product__list {
+ grid-template-columns: 1fr;
+ gap: 6rem;
+ }
+ .product__figure {
+ grid-row: span 2;
+ }
+}
+
+@media screen and (max-width: 600px) {
+ .product__item {
+ grid-template-columns: 1fr;
+ }
+
+ .product__figure {
+ grid-row: 1;
+ justify-self: center;
+ }
+}
+
+
+/* Product Detail
+ ========================================================================== */
+.product__detail {
+ display: grid;
+ grid-template-columns: 0.25fr 2fr 1fr;
+ gap: 1rem;
+}
+
+.gallery__thumbnail {
+ border: var(--default-border);
+ border-color: var(--bg-color);
+ cursor: pointer;
+ object-fit: cover;
+ aspect-ratio: 1/1;
+}
+
+.gallery__image {
+ text-align: center;
+}
+
+.gallery__thumbnail--focus {
+ border-color: var(--yellow-color);
+}
+
+.product__form input,
+.product__form select {
+ width: 100%;
+}
+
+@media screen and (max-width: 700px) {
+ .product__detail {
+ grid-template-columns: 0.25fr 2fr;
+ }
+
+ .product__info {
+ grid-column: span 2;
+ }
+}
+
+@media screen and (max-width: 700px) {
+ .product__detail {
+ grid-template-columns: 1fr;
+ grid-template-rows: 4rem 1fr auto;
+ }
+ .product__gallery {
+ display: flex;
+ }
+ .gallery__thumbnail {
+ max-height: 4rem;
+ }
+ .gallery__thumbnail:not(:last-child) {
+ margin-right: 0.5rem;
+ }
+ .product__image {
+ max-height: 16rem;
+ }
+ .product__info {
+ grid-column: 1;
+ }
+}
+
+
+/* Shopping Cart
+ ========================================================================== */
+.cart__list {
margin-bottom: 2rem;
- border-bottom: none;
+}
+.cart__item {
+ padding: 1rem 0;
+ border-bottom: var(--default-border);
+ display: grid;
+ grid-template-columns: 1fr 3fr 1fr;
+ gap: 1rem;
}
-.cart__total_price {
+.cart__table-wrapper {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.cart__summary {
text-align: right;
+}
+.cart__totals {
+ width: unset;
font-size: 1.5rem;
}
-.cart__total {
+
+.cart__totals th,
+.cart__totals td {
+ border: none;
+}
+.cart__totals th:first-child,
+.cart__totals td:first-child {
+ text-align: right;
+
+}
+
+.cart__proceed {
+ text-align: right;
display: flex;
align-items: center;
justify-content: flex-end;
}
-.coupon__form {
- max-width: 16rem;
- align-self: flex-end;
+.cart__proceed > .action-button {
+ font-size: 1.75rem;
}
-.item__figure img {
- vertical-align: middle;
+.item__image {
+ max-height: 12rem;
+}
+
+.item__price {
+ justify-self: end;
+}
+
+.item__form p,
+.coupon__form p {
+ display: flex;
+ align-items: center;
+}
+
+.coupon__form p {
+ justify-content: flex-end;
+}
+
+.item__form input[type=number] {
+ max-width: 6rem;
+}
+
+.coupon__form input[type=text] {
+ max-width: 8rem;
+}
+
+:is(.item__form, .coupon__form) label,
+:is(.item__form, .coupon__form) input:not(:last-child) {
+ margin-right: 0.5rem;
+}
+
+@media screen and (max-width: 500px) {
+ .cart__item {
+ grid-template-columns: 2fr 1fr;
+ }
+
+ .cart__proceed {
+ flex-direction: column;
+ }
+
+ .item__info {
+ grid-column: span 2;
+ grid-row: 2;
+ }
+
+ .item__price {
+ grid-column: 2;
+ grid-row: 1;
+ }
}
-.product__list {
- display: grid;
- grid-template-columns: repeat(2, 1fr);
- gap: 8rem;
+
+/* Checkout / Shipping Address
+ ========================================================================== */
+.checkout__address-form input,
+.checkout__address-form select {
+ display: block;
+ width: 100%;
+ max-width: 24rem;
}
-@media (max-width: 911px) {
- .product__list {
- grid-template-columns: 1fr;
- gap: 4rem;
- }
+.checkout__address {
+ margin-bottom: 2rem;
}
-.product__list-item {
- text-decoration: none;
- display: grid;
- grid-template-columns: repeat(2, 1fr);
- gap: 1rem;
-}
-
-.product__list-item form {
- grid-column: 1/3;
-}
-
-.product__list-item figure {
- margin: 0;
- padding: 0;
+#paypal-button-container {
+ max-width: 24rem;
+ margin-left: auto;
}
-.shipping__details {
- margin-bottom: 3rem;
- max-width: 32rem;
-}
-
-.shipping__details input[type=submit] {
- font-size: 1.25rem;
-
-}
-.order__total {
- /*margin: 3rem 0;*/
- text-align: right;
-}
-
+/* ==========================================================================
+ Footer
+ ========================================================================== */
footer {
margin: 4rem 0 0;
box-sizing: border-box;
- border-top: var(--default-border);
- padding: 2rem 0;
-}
-
-
-
-
-
-
-
-
-.object__header {
- display: flex;
- align-items: baseline;
- justify-content: space-between;
- margin-bottom: 1rem;
-}
-
-.object__list,
-.object__panel {
- background-color: white;
- border-radius: 0.5rem;
- margin-bottom: 2rem;
-}
-
-.object__item {
- display: grid;
- grid-template-columns: repeat(5, 1fr);
- gap: 1rem;
- padding: 1rem;
- border-bottom: 0.05rem solid var(--gray-color);
- text-decoration: none;
- align-items: center;
-}
-
-.panel__item:last-child,
-.object__item:last-child {
- border-bottom: unset;
- border-radius: 0 0 0.5rem 0.5rem;
-}
-
-.object__item:hover {
+ padding: 1rem 0;
background-color: var(--bg-alt-color);
}
-.panel__header {
- font-weight: bold;
- background-color: var(--bg-alt-color);
- border-radius: 0.5rem 0.5rem 0 0;
-}
-
-.panel__item {
- padding: 1rem;
- border-bottom: 0.05rem solid var(--gray-color);
- text-decoration: none;
-}
-
-
-.product__detail {
- display: grid;
- grid-template-columns: 1fr 2fr;
- gap: 2rem;
-}
-
-.fair-trade-stamp {
+footer > section {
text-align: center;
-}
-
-
-.user__emails {
- margin-bottom: 4rem;
-}
-
-
-
-
-
-
-._form_1 {
- margin: 0;
-}
-#_form_62486B0492FDE_ {
- margin: 1.7rem 0 !important;
- padding: 0 !important;
}
diff --git a/src/static/styles/normalize.css b/src/static/styles/normalize.css
new file mode 100644
index 0000000..192eb9c
--- /dev/null
+++ b/src/static/styles/normalize.css
@@ -0,0 +1,349 @@
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+ ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+ line-height: 1.15; /* 1 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+ ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+ margin: 0;
+}
+
+/**
+ * Render the `main` element consistently in IE.
+ */
+
+main {
+ display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
+}
+
+/* Grouping content
+ ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+ box-sizing: content-box; /* 1 */
+ height: 0; /* 1 */
+ overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+ ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+ background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+ border-bottom: none; /* 1 */
+ text-decoration: underline; /* 2 */
+ text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+ font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+ font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+sup {
+ top: -0.5em;
+}
+
+/* Embedded content
+ ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+ border-style: none;
+}
+
+/* Forms
+ ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 1 */
+ line-height: 1.15; /* 1 */
+ margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+ overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+ text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+ -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+ border-style: none;
+ padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+ outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+ padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ * `fieldset` elements in all browsers.
+ */
+
+legend {
+ box-sizing: border-box; /* 1 */
+ color: inherit; /* 2 */
+ display: table; /* 1 */
+ max-width: 100%; /* 1 */
+ padding: 0; /* 3 */
+ white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+ vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+ overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+ box-sizing: border-box; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+ height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+ -webkit-appearance: textfield; /* 1 */
+ outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+ -webkit-appearance: button; /* 1 */
+ font: inherit; /* 2 */
+}
+
+/* Interactive
+ ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+ display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+ display: list-item;
+}
+
+/* Misc
+ ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+ display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+ display: none;
+}
diff --git a/src/storefront/forms.py b/src/storefront/forms.py
index 15fbc92..b962d6a 100644
--- a/src/storefront/forms.py
+++ b/src/storefront/forms.py
@@ -31,8 +31,8 @@ class AddToCartForm(forms.Form):
(OTHER, 'Other (enter below)')
]
- quantity = forms.IntegerField(min_value=1, max_value=20, initial=1)
grind = forms.ChoiceField(choices=GRIND_CHOICES)
+ quantity = forms.IntegerField(min_value=1, max_value=20, initial=1)
class UpdateCartItemForm(forms.Form):
quantity = forms.IntegerField(min_value=1, max_value=20, initial=1)
@@ -104,7 +104,7 @@ class OrderCreateForm(forms.ModelForm):
}
class CouponApplyForm(forms.Form):
- code = forms.CharField(label='Enter coupon')
+ code = forms.CharField(label='Coupon code')
class ContactForm(forms.Form):
GOOGLE = 'Google Search'
diff --git a/src/storefront/templates/storefront/about.html b/src/storefront/templates/storefront/about.html
index 77c238b..eb35732 100644
--- a/src/storefront/templates/storefront/about.html
+++ b/src/storefront/templates/storefront/about.html
@@ -3,7 +3,7 @@
{% block content %}
- 
+ 
Order #{{order.pk}}
-
- 
-
+