From b6d2e61ff0c8abb2f27b2e2f67e964e7305ef683 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 15 Mar 2019 12:03:09 +0530 Subject: [PATCH] fix(style): frappe theme colours in bs4 and minor fix --- frappe/config/__init__.py | 1 + .../frappe/views/components/DeskModuleBox.vue | 2 +- frappe/public/scss/variables.scss | 19 +++++++++++++++++++ frappe/www/_test/__init__.py | 0 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 frappe/www/_test/__init__.py diff --git a/frappe/config/__init__.py b/frappe/config/__init__.py index 6ac3028355..1fe06f9094 100644 --- a/frappe/config/__init__.py +++ b/frappe/config/__init__.py @@ -45,6 +45,7 @@ def get_modules_from_app(app): active_modules_list = [] for m, module in iteritems(modules): module['module_name'] = m + module['app'] = app active_modules_list.append(module) else: for m in modules: diff --git a/frappe/public/js/frappe/views/components/DeskModuleBox.vue b/frappe/public/js/frappe/views/components/DeskModuleBox.vue index c52ad0a7be..245b47d147 100644 --- a/frappe/public/js/frappe/views/components/DeskModuleBox.vue +++ b/frappe/public/js/frappe/views/components/DeskModuleBox.vue @@ -109,7 +109,7 @@ export default { } .module-box:hover { - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08); + box-shadow: 0 3px 4px 0 rgba(18, 18, 19, 0.08); } .hovered-box { diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss index c734e165aa..ac9bf6cf03 100644 --- a/frappe/public/scss/variables.scss +++ b/frappe/public/scss/variables.scss @@ -1,2 +1,21 @@ +$gray-100: #fafbfc; +$gray-150: #f5f7fa; +$gray-200: #ebecf1; +$gray-300: #d1d8dd; +$gray-400: #ced4da; +$gray-500: #adb5bd; +$gray-600: #8d99a6; +$gray-700: #495057; +$gray-800: #36414c; +$gray-900: #2e3338; +$primary: #5e64ff; + +$black: #000; + +$body-color: $gray-800; +$text-muted: $gray-600; +$border-color: $gray-200; + @import "~bootstrap/scss/functions"; @import "~bootstrap/scss/variables"; + diff --git a/frappe/www/_test/__init__.py b/frappe/www/_test/__init__.py new file mode 100644 index 0000000000..e69de29bb2