Merge 51e9721 into df0738d

IgniteUI · Nov 16, 2021 · 1d7c768 · 1d7c768
2 parents df0738d + 51e9721
commit 1d7c768
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 21 deletions.
diff --git a/src/components/button/button.bootstrap.scss b/src/components/button/button.bootstrap.scss
@@ -1,16 +1,24 @@
 @use '../../styles/utilities' as utils;
 
 @mixin theme() {
+    igc-button::part(base) {
+        transition: all .15s ease-out;
+
+        &::before {
+            transition: all .15s ease-out;
+        }
+    }
+
     igc-button[size='large']::part(base) {
         --size: #{utils.rem(48px)};
     }
 
     igc-button[size='medium']::part(base) {
-        --size: #{utils.rem(40px)};
+        --size: #{utils.rem(38px)};
     }
 
     igc-button[size='small']::part(base) {
-        --size: #{utils.rem(32px)};
+        --size: #{utils.rem(31px)};
     }
 
     igc-button[variant='flat'][disabled]::part(base) {
@@ -20,18 +28,20 @@
 
     igc-button[variant='fab'][disabled]::part(base),
     igc-button[variant='contained'][disabled]::part(base) {
-        background: #{utils.color(primary, 100)};
-        color: #{utils.color(primary, 300)};
+        background: #{utils.color(primary, 200)};
+        color: #{utils.contrast-color(primary, 600)};
     }
 
     igc-button[variant='outlined'][disabled]::part(base) {
-        color: #{utils.color(primary, 100)};
-        box-shadow: 0 0 0 1px utils.color(primary, 100);
+        color: #{utils.color(primary, 500)};
+        box-shadow: 0 0 0 1px utils.color(primary, 500);
+        opacity: .65;
         background: transparent;
     }
 
     igc-button[variant='flat']:not([disabled])::part(base) {
         color: #{utils.color(primary, 500)};
+        border-radius: calc(var(--igc-border-radius) * 2);
 
         &:hover {
             color: #{utils.color(primary, 800)};
@@ -40,6 +50,7 @@
         &:focus,
         &:active {
             color: #{utils.color(primary, 600)};
+            box-shadow: 0 0 0 utils.rem(4px) utils.color(primary, 200, .5);
         }
 
         &:hover::before {
@@ -48,7 +59,7 @@
 
         &:focus::before,
         &:active::before {
-            background: #{utils.color(gray, 100)};
+            background: transparent;
             opacity: 1;
         }
     }
@@ -63,7 +74,7 @@
         &:focus,
         &:active {
             color: #{utils.contrast-color(primary, 600)};
-            box-shadow: 0 0 0 utils.rem(3px) utils.color(primary, 200);
+            box-shadow: 0 0 0 utils.rem(4px) utils.color(primary, 200, .5);
         }
 
         &::before {
@@ -81,7 +92,6 @@
 
     igc-button[variant='outlined']:not([disabled])::part(base) {
         color: #{utils.color(primary, 500)};
-        transition: color .15s ease-out;
         box-shadow: 0 0 0 1px utils.color(primary, 500);
         overflow: visible;
 
@@ -91,17 +101,17 @@
             width: 100%;
             height: 100%;
             border-radius: calc(var(--igc-border-radius) * 2);
-            transition: box-shadow .15s ease-out;
         }
 
         &:hover {
+            background: #{utils.color(primary, 600)};
             color: #{utils.contrast-color(primary, 600)};
         }
 
-        &:focus,
-        &:active {
-            color: #{utils.contrast-color(primary, 600)};
-        }
+        //&:focus,
+        //&:active {
+        //    color: #{utils.contrast-color(primary, 600)};
+        //}
 
         &:hover::before {
             background: #{utils.color(primary, 500)};
@@ -110,13 +120,13 @@
 
         &:focus::before,
         &:active::before {
-            background: #{utils.color(primary, 500)};
+            background: transparent;
             opacity: 1;
         }
 
         &:focus::after,
         &:active::after {
-            box-shadow: 0 0 0 utils.rem(3px) utils.color(primary, 200);
+            box-shadow: 0 0 0 utils.rem(4px) utils.color(primary, 200, .5);
         }
     }
 
@@ -142,7 +152,7 @@
         &:focus,
         &:active {
             color: #{utils.contrast-color(primary, 600)};
-            box-shadow: 0 0 0 utils.rem(3px) utils.color(primary, 200);
+            box-shadow: 0 0 0 utils.rem(4px) utils.color(primary, 200, .5);
         }
 
         &::before {

diff --git a/src/styles/themes/bootstrap.scss b/src/styles/themes/bootstrap.scss
@@ -12,12 +12,12 @@
 @use '../../components/input/input.bootstrap' as input;
 
 $palette: utils.palette(
-    $primary: #007bff,
+    $primary: #0d6efd,
     $secondary: #6c757d,
-    $gray: #000,
+    $gray: #adb5bd,
     $surface: #f8f9fa,
-    $info: #17a2b8,
-    $success: #28a745,
+    $info: #0dcaf0,
+    $success: #198754,
     $warn: #ffc107,
     $error: #dc3545,
 ) !default;