From c1df1b1f1892bd580cb5ea5441407fc4b994adc8 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 14 Jun 2022 14:44:55 +0530 Subject: [PATCH] fix: min height for disabled field moved to common scss --- frappe/public/scss/common/css_variables.scss | 6 ++++++ frappe/public/scss/common/form.scss | 1 + frappe/public/scss/desk/css_variables.scss | 6 ------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss index e047747f5c..ab52c10e45 100644 --- a/frappe/public/scss/common/css_variables.scss +++ b/frappe/public/scss/common/css_variables.scss @@ -1,3 +1,5 @@ +$input-height: 28px !default; + :root, [data-theme="light"] { --brand-color: #0089FF; @@ -250,6 +252,10 @@ --primary-color: #2490EF; --btn-height: 30px; + // input + --input-height: #{$input-height}; + --input-disabled-bg: var(--gray-200); + // Checkbox --checkbox-right-margin: var(--margin-xs); --checkbox-size: 14px; diff --git a/frappe/public/scss/common/form.scss b/frappe/public/scss/common/form.scss index fcea603994..a01ff54c28 100644 --- a/frappe/public/scss/common/form.scss +++ b/frappe/public/scss/common/form.scss @@ -13,6 +13,7 @@ font-weight: normal; font-size: var(--text-sm); } + min-height: var(--input-height); border-radius: $border-radius; font-weight: 400; padding: 6px 12px; diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss index a06ba3e9b0..aceaa3e1e6 100644 --- a/frappe/public/scss/desk/css_variables.scss +++ b/frappe/public/scss/desk/css_variables.scss @@ -1,7 +1,5 @@ @import '../common/css_variables.scss'; -$input-height: 28px !default; - :root, [data-theme="light"] { // breakpoints @@ -31,10 +29,6 @@ $input-height: 28px !default; --page-head-height: 75px; --page-bottom-margin: 60px; - // input - --input-height: #{$input-height}; - --input-disabled-bg: var(--gray-200); - // checkbox --checkbox-right-margin: var(--margin-xs); --checkbox-size: 14px;