From ae5ee30a780ecda435f9113ded3769df74a06910 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Tue, 10 May 2016 16:46:39 +0530 Subject: [PATCH 1/2] Spaces and blogger name fixed --- frappe/public/css/website.css | 21 +++++++++++---------- frappe/public/less/website.less | 17 +++++++++-------- frappe/templates/includes/blog/blog.html | 10 +--------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index 6f2ce80f87..e817756041 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -382,6 +382,15 @@ h5, h6 { font-weight: 400; } +h1 a, +h2 a, +h3 a, +h4 a, +h5 a, +h6 a { + color: inherit !important; + text-decoration: none; +} .navbar-brand { max-width: none; } @@ -582,7 +591,8 @@ fieldset { margin-top: 15px; } .web-list-item { - padding: 15px 0px; + padding-top: 15px; + padding-bottom: 45px; border-bottom: 1px solid #EBEFF2; } .web-list-item h1, @@ -590,15 +600,6 @@ fieldset { .web-list-item h3 { margin-top: 10px; } -.web-list-item h1 a, -.web-list-item h2 a, -.web-list-item h3 a, -.web-list-item h4 a, -.web-list-item h5 a, -.web-list-item h6 a { - color: inherit !important; - text-decoration: none; -} .blog-info { text-align: center; margin-top: 30px; diff --git a/frappe/public/less/website.less b/frappe/public/less/website.less index 28f0acf6b6..cf6973e381 100644 --- a/frappe/public/less/website.less +++ b/frappe/public/less/website.less @@ -20,6 +20,13 @@ a& { h1, h2, h3, h4, h5, h6 { font-weight: 400; + + // anchor inside header should not be styled + a { + color: inherit !important; + text-decoration: none; + } + } @@ -269,19 +276,13 @@ fieldset { } .web-list-item { - padding: 15px 0px; + padding-top: 15px; + padding-bottom: 45px; border-bottom: 1px solid @light-border-color; h1, h2, h3 { margin-top: 10px; } - - h1, h2, h3, h4, h5, h6 { - a { - color: inherit !important; - text-decoration: none; - } - } } // .web-list-item:hover { diff --git a/frappe/templates/includes/blog/blog.html b/frappe/templates/includes/blog/blog.html index e4d5a1eabd..18617a3cf7 100644 --- a/frappe/templates/includes/blog/blog.html +++ b/frappe/templates/includes/blog/blog.html @@ -16,12 +16,4 @@ {% block script %} -{% endblock %} - -{% block style %} - -{% endblock %} +{% endblock %} \ No newline at end of file From b1445481f671c3c951bba6cf77596783816ed611 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Tue, 10 May 2016 17:58:07 +0530 Subject: [PATCH 2/2] page-content padding fixed --- frappe/public/css/website.css | 6 +++--- frappe/public/less/website.less | 11 ++++++----- frappe/templates/web.html | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index e817756041..768146ca43 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -591,8 +591,7 @@ fieldset { margin-top: 15px; } .web-list-item { - padding-top: 15px; - padding-bottom: 45px; + padding: 15px 0px; border-bottom: 1px solid #EBEFF2; } .web-list-item h1, @@ -646,6 +645,7 @@ fieldset { .blog-list-item { margin-top: 30px; margin-bottom: 30px; + padding-bottom: 45px; } .blog-list-item .blog-header { font-size: 1.6em; @@ -918,7 +918,7 @@ body { .your-account-info { margin-top: 50px; } -.page-content { +.page-content.with-sidebar { padding-left: 50px; padding-right: 50px; } diff --git a/frappe/public/less/website.less b/frappe/public/less/website.less index cf6973e381..61ee817298 100644 --- a/frappe/public/less/website.less +++ b/frappe/public/less/website.less @@ -276,8 +276,7 @@ fieldset { } .web-list-item { - padding-top: 15px; - padding-bottom: 45px; + padding: 15px 0px; border-bottom: 1px solid @light-border-color; h1, h2, h3 { @@ -343,8 +342,9 @@ fieldset { } .blog-list-item { - margin-top:30px; - margin-bottom:30px; + margin-top: 30px; + margin-bottom: 30px; + padding-bottom: 45px; .blog-header { font-size: 1.6em; @@ -518,7 +518,8 @@ a.active { .your-account-info { margin-top: 50px; } -.page-content { + +.page-content.with-sidebar { padding-left: 50px; padding-right: 50px; } diff --git a/frappe/templates/web.html b/frappe/templates/web.html index 3c2b31957a..b70eec2891 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -10,7 +10,7 @@ {% include "templates/includes/web_sidebar.html" %} {% endif %} -
+