Merge branch 'master' into schematics-types

IgniteUI · Feb 9, 2024 · edd5e0d · edd5e0d
2 parents 95f54ea + d0972e5
commit edd5e0d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "express": "^4.18.2",
     "fflate": "^0.8.1",
     "hammerjs": "^2.0.8",
-    "igniteui-theming": "^4.1.0",
+    "igniteui-theming": "^4.2.0",
     "igniteui-trial-watermark": "^3.0.2",
     "lodash-es": "^4.17.21",
     "rxjs": "^7.8.0",

diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -76,7 +76,7 @@
         "igniteui-trial-watermark": "^3.0.2",
         "lodash-es": "^4.17.21",
         "uuid": "^9.0.0",
-        "igniteui-theming": "^4.1.0",
+        "igniteui-theming": "^4.2.0",
         "@igniteui/material-icons-extended": "^3.0.0"
     },
     "peerDependencies": {

diff --git a/projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss
@@ -464,12 +464,6 @@
             map.get($items-gap, 'comfortable')
         );
 
-
-        @if ($variant == 'bootstrap') {
-            // important is needed to override the typography margins
-            margin: rem(4px) !important;
-        }
-
         igx-icon {
             --component-size: var(--ig-size, var(--ig-size-large));
             display: flex;

diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss
@@ -459,6 +459,11 @@
         margin-inline: pad-inline(rem(4px), rem(4px), rem(16px));
         margin-block-start: 0;
 
+        @if $bootstrap-theme {
+            // important is needed to override the typography margins
+            margin-block-end: rem(4px) !important;
+        }
+
         igx-icon {
             width: var(--igx-icon-size, #{rem(18px)});
             height: var(--igx-icon-size, #{rem(18px)});

diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
@@ -2660,6 +2660,12 @@
         [igxIconButton] {
             --ig-size: 1;
         }
+
+        @if ($variant == 'bootstrap') {
+            [igxButton] {
+                margin: rem(4px);
+            }
+        }
     }
 
     %igx-grid__filtering-dropdown-items {

diff --git a/projects/igniteui-angular/src/lib/core/styles/components/navbar/_navbar-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/navbar/_navbar-theme.scss
@@ -108,6 +108,10 @@
         box-shadow: var-get($theme, 'shadow');
         z-index: 4;
         overflow: hidden;
+
+        @if $variant == 'bootstrap' {
+            border-bottom: rem(1px) solid var-get($theme, 'border-color');
+        }
     }
 
     %igx-navbar-part {