From c35f0a45b0e8269332d21bc32ec146da647ae7ff Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Wed, 24 Mar 2021 14:04:20 +0300
Subject: [PATCH 1/2] feat(core-blocks): CB-808 update input border

---
 .../core-blocks/src/FormControls/ComboboxNew.tsx     |  4 ++--
 .../core-theming/src/styles/_form-controls.scss      |  8 ++++----
 .../core-theming/src/styles/_theme-light.scss        | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx b/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx
index b6a27894f1..c97533f8d4 100644
--- a/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx
@@ -45,7 +45,7 @@ const styles = composes(
       font-weight: 500;
     }
     input {
-      padding-right: 20px;
+      padding-right: 12px !important;
     }
     MenuButton {
       position: absolute;
@@ -73,7 +73,7 @@ const styles = composes(
       & MenuItem {
         background: transparent;
         display: block;
-        padding: 4px 36px;
+        padding: 4px 12px;
         text-align: left;
         outline: none;
         color: inherit;
diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index c4e75f0438..66add1ab59 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -58,14 +58,14 @@
   input[role="new"],
   textarea[role="new"] {
     box-sizing: border-box;
-    padding: 7px 11px;
+    padding: 7px 12px;
     font-size: 12px;
     width: 100%;
     border: 2px solid;
     outline: none;
     border-radius: 3px;
 
-    @include mdc-theme-prop(color, on-secondary, false);
+    @include mdc-theme-prop(color, text-primary-on-light, false);
     @include mdc-theme-prop(border-color, background, false);
     @include mdc-theme-prop(background-color, input-background, false);
 
@@ -81,12 +81,12 @@
     &:global([readonly]) {
       @include mdc-theme-prop(border-color, input-border-readonly, false);
       @include mdc-theme-prop(background-color, input-background-readonly, false);
-      opacity: 0.8;
+      @include mdc-theme-prop(color, text-secondary-on-light, false);
     }
     &:global([disabled]) {
       @include mdc-theme-prop(border-color, input-border-disabled, false);
       @include mdc-theme-prop(background-color, input-background-disabled, false);
-      opacity: 0.7;
+      @include mdc-theme-prop(color, text-hint-on-light, false);
     }
     &:global([data-embedded]) {
       &:global([disabled]),
diff --git a/webapp/packages/core-theming/src/styles/_theme-light.scss b/webapp/packages/core-theming/src/styles/_theme-light.scss
index fcb61edd6c..127cc8938c 100644
--- a/webapp/packages/core-theming/src/styles/_theme-light.scss
+++ b/webapp/packages/core-theming/src/styles/_theme-light.scss
@@ -21,12 +21,12 @@ $color-negative: #e73e52;
 $link-color: $mdc-theme-primary;
 $link-color-focus: #3f96d1;
 
-$input-border: #dedede;
-$input-border-disabled: transparent;
-$input-border-readonly: transparent;
+$input-border: #d9d9d9;
+$input-border-disabled: $input-border;
+$input-border-readonly: $input-border;
 $input-background: $mdc-theme-surface;
-$input-background-disabled: $mdc-theme-secondary;
-$input-background-readonly: $mdc-theme-secondary;
+$input-background-disabled: #e9e9e9;
+$input-background-readonly: #e9e9e9;
 
 $mdc-theme-text-colors: (
   light: (
@@ -40,7 +40,7 @@ $mdc-theme-text-colors: (
     primary: rgba(black, 0.87),
     secondary: rgba(black, 0.45),
     hint: rgba(black, 0.45),
-    disabled: rgba(black, 0.20),
+    disabled: rgba(black, 0.2),
     icon: rgba(black, 0.38),
   ),
 );

From b4983efa2a4f2851ebe34b26f9421ce5176e7c3c Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Thu, 8 Apr 2021 19:11:55 +0300
Subject: [PATCH 2/2] feat(core-blocks): CB-808 revert input color changes

---
 webapp/packages/core-theming/src/styles/_form-controls.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index 40fb9e2a7b..3fd88093c7 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -65,7 +65,7 @@
     outline: none;
     border-radius: 3px;
 
-    @include mdc-theme-prop(color, text-primary-on-light, false);
+    @include mdc-theme-prop(color, on-secondary, false);
     @include mdc-theme-prop(border-color, background, false);
     @include mdc-theme-prop(background-color, input-background, false);
 
@@ -87,12 +87,12 @@
     &:global([readonly]) {
       @include mdc-theme-prop(border-color, input-border-readonly, false);
       @include mdc-theme-prop(background-color, input-background-readonly, false);
-      @include mdc-theme-prop(color, text-secondary-on-light, false);
+      opacity: 0.8;
     }
     &:global([disabled]) {
       @include mdc-theme-prop(border-color, input-border-disabled, false);
       @include mdc-theme-prop(background-color, input-background-disabled, false);
-      @include mdc-theme-prop(color, text-hint-on-light, false);
+      opacity: 0.7;
     }
     &:global([data-embedded]) {
       &:global([disabled]),