diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css index 065e2818efd..ab3beb03be3 100644 --- a/erpnext/public/css/website.css +++ b/erpnext/public/css/website.css @@ -45,11 +45,6 @@ .product-text { padding: 15px 0px; } -.product-label { - padding-bottom: 4px; - text-transform: uppercase; - font-size: 12px; -} .product-search { margin-bottom: 15px; } diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less index 4aa3940442b..37d69e0c9a7 100644 --- a/erpnext/public/less/website.less +++ b/erpnext/public/less/website.less @@ -51,12 +51,6 @@ padding: 15px 0px; } -.product-label { - padding-bottom: 4px; - text-transform: uppercase; - font-size: 12px; -} - .product-search { margin-bottom: 15px; } @@ -165,7 +159,7 @@ .cart-container { margin: 50px 0px; - + .checkout { margin-bottom:15px; } @@ -223,7 +217,7 @@ .cart-dropdown-container { width: 400px; padding: 15px; - + .item-price { display: block !important; padding-bottom: 10px; @@ -232,12 +226,12 @@ .cart-item-header { border-bottom: 1px solid #d1d8dd; } - + .cart-items-dropdown { max-height: 350px; - overflow: auto; + overflow: auto; } - + .cart-items-dropdown .cart-dropdown { display:block; margin-top:15px; diff --git a/erpnext/schools/doctype/student_sibling/student_sibling.json b/erpnext/schools/doctype/student_sibling/student_sibling.json index b07b9587370..d6209875071 100644 --- a/erpnext/schools/doctype/student_sibling/student_sibling.json +++ b/erpnext/schools/doctype/student_sibling/student_sibling.json @@ -14,15 +14,15 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "columns": 0, - "fieldname": "name1", + "columns": 4, + "fieldname": "full_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, - "label": "Name", + "label": "Full Name", "length": 0, "no_copy": 0, "options": "", @@ -101,7 +101,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-09-01 14:43:53.473391", + "modified": "2016-09-13 12:39:05.078062", "modified_by": "Administrator", "module": "Schools", "name": "Student Sibling", diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html index cf6f89bb925..5a8116cc37b 100644 --- a/erpnext/templates/generators/item.html +++ b/erpnext/templates/generators/item.html @@ -88,7 +88,7 @@ {% for d in website_specifications -%} - + {%- endfor %}
{{ d.label }}{{ d.label }} {{ d.description }}