From 2c36874554e6c70fe08bf9d3a9c7b9d5d2be64f1 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 13 Jul 2022 12:39:43 +0530 Subject: [PATCH] style: add config for CSS and SCSS --- .editorconfig | 2 +- frappe/public/scss/common/css_variables.scss | 8 ++++---- frappe/public/scss/desk/dark.scss | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index d76f67cd7f..f4c7f1528c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,6 @@ trim_trailing_whitespace = true charset = utf-8 # python, js indentation settings -[{*.py,*.js,*.vue}] +[{*.py,*.js,*.vue,*.css,*.scss,*.html}] indent_style = tab indent_size = 4 diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss index efcbe06920..0b6da84222 100644 --- a/frappe/public/scss/common/css_variables.scss +++ b/frappe/public/scss/common/css_variables.scss @@ -134,7 +134,7 @@ $input-height: 28px !default; --shadow-xs: rgba(0, 0, 0, 0.05) 0px 0.5px 0px 0px, rgba(0, 0, 0, 0.08) 0px 0px 0px 1px, rgba(0, 0, 0, 0.05) 0px 2px 4px 0px; --shadow-sm: 0px 1px 2px rgba(25, 39, 52, 0.05), 0px 0px 4px rgba(25, 39, 52, 0.1); - --shadow-base: 0px 4px 8px rgba(25, 39, 52, 0.06), 0px 0px 4px rgba(25, 39, 52, 0.12); + --shadow-base: 0px 4px 8px rgba(25, 39, 52, 0.06), 0px 0px 4px rgba(25, 39, 52, 0.12); --shadow-md: 0px 8px 14px rgba(25, 39, 52, 0.08), 0px 2px 6px rgba(25, 39, 52, 0.04); --shadow-lg: 0px 18px 22px rgba(25, 39, 52, 0.1), 0px 1px 10px rgba(0, 0, 0, 0.06), 0px 0.5px 5px rgba(25, 39, 52, 0.04); @@ -262,9 +262,9 @@ $input-height: 28px !default; --checkbox-focus-shadow: 0 0 0 2px var(--gray-300); --checkbox-gradient: linear-gradient(180deg, #4AC3F8 -124.51%, var(--primary) 100%); - // "diff" colors - --diff-added: var(--green-100); - --diff-removed: var(--red-100); + // "diff" colors + --diff-added: var(--green-100); + --diff-removed: var(--red-100); --right-arrow-svg: url("data: image/svg+xml;utf8, "); --left-arrow-svg: url("data: image/svg+xml;utf8, "); diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index 3d05ecd237..731ff4525d 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -91,11 +91,11 @@ --highlight-shadow: 1px 1px 10px var(--blue-900), 0px 0px 4px var(--blue-500); - --shadow-base: 0px 4px 8px rgba(114, 176, 233, 0.06), 0px 0px 4px rgba(112, 172, 228, 0.12); + --shadow-base: 0px 4px 8px rgba(114, 176, 233, 0.06), 0px 0px 4px rgba(112, 172, 228, 0.12); - // "diff" colors - --diff-added: var(--green-800); - --diff-removed: var(--red-800); + // "diff" colors + --diff-added: var(--green-800); + --diff-removed: var(--red-800); // input --input-disabled-bg: none;