From 96c765bb67bd25977f4c830f3a0ac2b1c100bf9b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 4 Jun 2020 17:48:39 +0530 Subject: [PATCH] refactor: use bootstrap classes and sass variables --- frappe/public/scss/blog.scss | 14 ++------------ .../blog_post/templates/blog_post_list.html | 2 +- .../doctype/blog_post/templates/blog_post_row.html | 2 +- .../website/website_theme/standard/standard.json | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/frappe/public/scss/blog.scss b/frappe/public/scss/blog.scss index 7523a9cdc0..f16e04b6df 100644 --- a/frappe/public/scss/blog.scss +++ b/frappe/public/scss/blog.scss @@ -10,19 +10,9 @@ } .blog-card { - margin-bottom: 3rem; + margin-bottom: 2rem; position: relative; width: 100%; - padding-right: 15px; - padding-left: 15px; - - flex: 0 0 33.33333%; - max-width: 33.33333%; - - &.featured { - flex: 0 0 66.66667%; - max-width: 66.66667%; - } .card-body { display: flex; @@ -75,7 +65,7 @@ .blog-footer { display: flex; justify-content: space-between; - color: #8d99a6; + color: $text-muted; margin-top: 3rem; } diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html index 625e4645cd..2677c70f92 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_list.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html @@ -21,7 +21,7 @@
-
+
{% if not result -%}
{{ no_result_message or _("Nothing to show") }} diff --git a/frappe/website/doctype/blog_post/templates/blog_post_row.html b/frappe/website/doctype/blog_post/templates/blog_post_row.html index ef706c5e59..7daf27adc8 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post_row.html +++ b/frappe/website/doctype/blog_post/templates/blog_post_row.html @@ -1,5 +1,5 @@ {%- set post = doc -%} -
+
{% if post.cover_image %} diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 11527a5229..e2e3bbcf28 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -9,7 +9,7 @@ "doctype": "Website Theme", "font_properties": "wght:400;500;600;700;800", "idx": 28, - "modified": "2020-05-19 00:33:58.011046", + "modified": "2020-06-04 17:47:09.207101", "modified_by": "Administrator", "module": "Website", "name": "Standard",