From ac123c57f32ba5289459616189ecb064c74fc549 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 20 May 2016 16:36:56 +0530 Subject: [PATCH] [cleanup] website / portal css --- erpnext/public/css/website.css | 28 +++------------ erpnext/public/less/website.less | 33 +++++------------ .../templates/includes/transaction_row.html | 2 +- erpnext/templates/pages/home.html | 35 ++++++++++++++++--- 4 files changed, 44 insertions(+), 54 deletions(-) diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css index 6c239c5799..db8f2fcb99 100644 --- a/erpnext/public/css/website.css +++ b/erpnext/public/css/website.css @@ -71,10 +71,6 @@ .featured-products { border-top: 1px solid #EBEFF2; } -.transaction-list-item { - padding: 30px; - margin: 0px -30px; -} .transaction-list-item:hover, .transaction-list-item:active, .transaction-list-item:focus { @@ -83,7 +79,6 @@ .transaction-list-item .indicator { font-weight: inherit; color: #8D99A6; - margin-left: -15px; } .transaction-list-item .items-preview, .transaction-list-item .transaction-time { @@ -123,8 +118,8 @@ margin-top: 15px; } .order-container .tax-grand-total-row { - border-top: 1px solid #d1d8dd; padding-top: 15px; + padding-bottom: 30px; } .order-container .tax-grand-total { display: inline-block; @@ -217,6 +212,10 @@ .item-group-nav-buttons { margin-top: 15px; } +.footer-subscribe .btn-default { + background-color: transparent; + border: 1px solid #d1d8dd; +} @media (min-width: 992px) { .footer-subscribe { max-width: 350px; @@ -238,20 +237,3 @@ .product-image-wrapper { padding-bottom: 40px; } -.featured-product-heading, -.all-products { - text-transform: uppercase; - letter-spacing: 0.5px; - font-size: 12px; - font-weight: 500; -} -.all-products { - font-weight: 300; - padding-left: 25px; - padding-right: 25px; - padding-top: 10px; - padding-bottom: 10px; -} -.homepage-tagline { - font-size: 40px !important; -} diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less index 37e3616d35..5d89265592 100644 --- a/erpnext/public/less/website.less +++ b/erpnext/public/less/website.less @@ -84,9 +84,6 @@ } .transaction-list-item { - padding: 30px; - margin: 0px -30px; - &:hover, &:active, &:focus { @@ -96,7 +93,6 @@ .indicator { font-weight: inherit; color: @text-muted; - margin-left: -15px; } .transaction-time { @@ -155,8 +151,8 @@ } .tax-grand-total-row { - border-top: 1px solid @border-color; padding-top: 15px; + padding-bottom: 30px; } .tax-grand-total { @@ -279,6 +275,13 @@ margin-top: 15px; } +.footer-subscribe { + .btn-default { + background-color: transparent; + border: 1px solid @border-color; + } +} + @media (min-width: 992px) { .footer-subscribe { max-width: 350px; @@ -305,23 +308,3 @@ padding-bottom: 40px; } - -.featured-product-heading, .all-products { - text-transform: uppercase; - letter-spacing: 0.5px; - font-size: 12px; - font-weight: 500; -} - -.all-products { - font-weight: 300; - padding-left: 25px; - padding-right: 25px; - padding-top: 10px; - padding-bottom: 10px; -} - -.homepage-tagline { - font-size:40px !important; -} - diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html index 17f9b90939..f0fee97d46 100644 --- a/erpnext/templates/includes/transaction_row.html +++ b/erpnext/templates/includes/transaction_row.html @@ -9,7 +9,7 @@ {{ frappe.utils.format_datetime(doc.modified, "medium") }} -
+
{{ doc.items_preview }}
diff --git a/erpnext/templates/pages/home.html b/erpnext/templates/pages/home.html index 689d94edd3..56bf019778 100644 --- a/erpnext/templates/pages/home.html +++ b/erpnext/templates/pages/home.html @@ -7,8 +7,10 @@
-
{{ homepage.tag_line or '' }}
-

{{ homepage.description or '' }}

+
+

{{ homepage.tag_line or '' }}

+

{{ homepage.description or '' }}

+
{% if homepage.products %}
- +
{% endif %}
@@ -36,8 +40,14 @@ {% block style %} {% endblock %}