From 958d5f55971b14e9d9716f7f46877aecfd68ef9c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 18 Sep 2020 16:28:11 +0530 Subject: [PATCH] style: sider suggestions --- frappe/public/scss/footer.scss | 12 +++++----- frappe/public/scss/navbar.scss | 22 +++++++++---------- frappe/public/scss/page-builder.scss | 3 --- .../doctype/web_template/web_template.py | 1 + generate_bootstrap_theme.js | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/frappe/public/scss/footer.scss b/frappe/public/scss/footer.scss index a12fb10033..bb61f3c274 100644 --- a/frappe/public/scss/footer.scss +++ b/frappe/public/scss/footer.scss @@ -25,6 +25,12 @@ } } +.footer-col-right { + @include media-breakpoint-up(sm) { + text-align: right; + } +} + .footer-col-left, .footer-col-right { padding-top: 0.8rem; padding-bottom: 1rem; @@ -35,12 +41,6 @@ } } -.footer-col-right { - @include media-breakpoint-up(sm) { - text-align: right; - } -} - .footer-col-left .footer-link { margin-right: 1rem; } diff --git a/frappe/public/scss/navbar.scss b/frappe/public/scss/navbar.scss index 6294029892..eae59b0295 100644 --- a/frappe/public/scss/navbar.scss +++ b/frappe/public/scss/navbar.scss @@ -2,17 +2,6 @@ border-bottom: 1px solid $border-color; } -.navbar-light .navbar-nav .nav-link { - color: $gray-700; - font-size: $font-size-sm; - font-weight: 500; - - &:hover, - &:focus, &.active { - color: $primary; - } -} - .navbar-brand { img { display: inline-block; @@ -57,3 +46,14 @@ } } } + +.navbar-light .navbar-nav .nav-link { + color: $gray-700; + font-size: $font-size-sm; + font-weight: 500; + + &:hover, + &:focus, &.active { + color: $primary; + } +} diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss index e426c44204..24dbca3e21 100644 --- a/frappe/public/scss/page-builder.scss +++ b/frappe/public/scss/page-builder.scss @@ -627,9 +627,6 @@ .feature-url { margin-top: 0.875rem; - } - - .feature-url { font-size: $font-size-sm; } diff --git a/frappe/website/doctype/web_template/web_template.py b/frappe/website/doctype/web_template/web_template.py index e9db87a679..ed0348ac46 100644 --- a/frappe/website/doctype/web_template/web_template.py +++ b/frappe/website/doctype/web_template/web_template.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe import os from frappe.model.document import Document +from frappe import _ from frappe.modules.export_file import ( export_to_files, create_folder, diff --git a/generate_bootstrap_theme.js b/generate_bootstrap_theme.js index 45f533e8ab..2113d55e11 100644 --- a/generate_bootstrap_theme.js +++ b/generate_bootstrap_theme.js @@ -34,7 +34,7 @@ sass.render({ if (!err) { console.log(output_path); // eslint-disable-line } else { - console.error(err); + console.error(err); // eslint-disable-line } }); });