@syncfusion/blazor-themes 26.1.40 → 26.1.42

package/SCSS-Themes/ribbon/ribbon/fluent.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/fluent2-dark.scss

@@ -939,6 +939,7 @@ $ribbon-gallery-button-selected-icon-color: $icon-color !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/fluent2.scss

@@ -939,6 +939,7 @@ $ribbon-gallery-button-selected-icon-color: $icon-color !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/highcontrast.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/material-dark.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/material.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/material3-dark.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/material3.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/tailwind-dark.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/ribbon/ribbon/tailwind.scss

@@ -939,6 +939,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {

package/SCSS-Themes/tailwind-dark.scss

@@ -25535,6 +25535,11 @@ $calendar-today-btn-primary-disabled-border-color: $primary-border-color-disable
             color: $calendar-today-focused-font-color;
           }
         }
+        #{if(&, '&', '*')}.e-month td.e-disabled.e-today span.e-day {
+          @if ($skin-name == 'FluentUI' or $skin-name == 'fluent2') {
+            color: $calendar-today-disabled-color;
+          }
+        }
         #{if(&, '&', '*')}.e-year td.e-selected > span.e-day,
         #{if(&, '&', '*')}.e-decade td.e-selected > span.e-day,
         #{if(&, '&', '*')}.e-year td.e-selected:hover > span.e-day,
@@ -32023,7 +32028,13 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
       &.e-scale {
         &.e-h-scale {
           .e-tick {
-            @if ($skin-name != 'material' and $skin-name != 'material-dark') {
+            @if ($skin-name != 'material' and $skin-name == 'material-dark') {
+              @include alignment($tick-after-height, $tick-after-top, 'horizontal');
+              @if ($skin-name == 'material-dark') {
+                background-position: bottom;
+              }
+            }
+            @else if ($skin-name != 'material' and $skin-name != 'material-dark') {
               @include alignment($tick-after-height, $tick-after-top, 'horizontal');
             }
             @else {
@@ -32033,7 +32044,10 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
           }
 
           .e-large {
-            @if ($skin-name != 'material' and $skin-name != 'material-dark') {
+            @if ($skin-name != 'material' and $skin-name == 'material-dark') {
+              @include alignment($largetick-before-height, $largetick-before-top, 'horizontal');
+            }
+            @else if ($skin-name != 'material' and $skin-name != 'material-dark') {
               @include alignment($largetick-before-height, $largetick-before-top, 'horizontal');
             }
           }
@@ -32063,7 +32077,13 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
       &.e-scale {
         &.e-h-scale {
           .e-tick {
-            @if ($skin-name != 'material' and $skin-name != 'material-dark') {
+            @if ($skin-name != 'material' and $skin-name == 'material-dark') {
+              @include alignment($tick-before-height, $tick-before-top, 'horizontal');
+              @if ($skin-name == 'material-dark') {
+                background-position-x: center;
+              }
+            }
+            @else if ($skin-name != 'material' and $skin-name != 'material-dark') {
               @include alignment($tick-before-height, $tick-before-top, 'horizontal');
             }
             @else {
@@ -32073,7 +32093,10 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
           }
 
           .e-large {
-            @if ($skin-name != 'material' and $skin-name != 'material-dark') {
+            @if ($skin-name != 'material' and $skin-name == 'material-dark') {
+              @include alignment($largetick-after-height, $largetick-after-top, 'horizontal');
+            }
+            @else if ($skin-name != 'material' and $skin-name != 'material-dark') {
               @include alignment($largetick-after-height, $largetick-after-top, 'horizontal');
             }
           }
@@ -32149,7 +32172,12 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
             }
             @if ($skin-name == 'material' or $skin-name == 'material-dark') {
               background-position: center;
-              height: 99%;
+              @if ($skin-name == 'material-dark') {
+                height: 12px;
+              }
+              @else {
+                height: 99%;
+              }
             }
           }
 
@@ -32175,6 +32203,10 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
             @else if ($skin-name == 'fabric' or $skin-name == 'fabric-dark' or $skin-name == 'highcontrast' or $skin-name == 'highcontrast-light') {
               @include alignment(calc(100% + 3px), -9px, 'horizontal');
             }
+            @else if ($skin-name == 'material-dark') {
+              height: 20px;
+              top: 4px;
+            }
           }
         }
 
@@ -32274,7 +32306,7 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
           background-position: center center;
         }
 
-        @if ($skin-name == 'bootstrap4' or $skin-name == 'tailwind' or $skin-name == 'bootstrap5' or $skin-name == 'FluentUI' or $skin-name == 'Material3') {
+        @if ($skin-name == 'bootstrap4' or $skin-name == 'tailwind' or $skin-name == 'bootstrap5' or $skin-name == 'FluentUI' or $skin-name == 'Material3' or $skin-name == 'material-dark') {
           &.e-large {
             @if ($skin-name != 'bootstrap4') {
               background-image: $slider-scale-tick-image-dark;
@@ -32364,7 +32396,7 @@ $slider-tick-font-color: $content-text-color-alt1 !default;
         .e-tick {
           display: inline-block;
           @if ($skin-name == 'material' or $skin-name == 'material-dark') {
-            background-repeat: no-repeat;
+            background-repeat: repeat-y;
           }
 
           @if ($skin-name != 'material' and $skin-name != 'material-dark') {
@@ -54736,7 +54768,8 @@ $treeview-drag-icon-color: $treeview-icon-color !default;
 
     .e-list-item {
 
-      div.e-icons::before {
+      div.e-icons.e-icon-expandable::before,
+      div.e-icons.e-icon-collapsible::before {
         content: '\e75c';
       }
     }
@@ -57893,7 +57926,7 @@ $ddt-item-hover-bg: $content-bg-color-hover !default;
 
       &.e-chip-input {
         width: 0;
-        display: none;
+        visibility: hidden;
       }
     }
 
@@ -61435,6 +61468,9 @@ ejs-multiselect {
   @if $ddl-multiselect-skin-name != 'Material3' {
     background-color: $ddl-chip-bg-color;
   }
+  @if $ddl-multiselect-skin-name == 'fluent2' {
+    border: $dd-chip-border;
+  }
   border-radius: $ddl-chip-radius;
   height: $ddl-chip-height;
 }
@@ -68807,7 +68843,7 @@ $de-hlt-clr-height-bigger: 24px;
             }
         }
     }
-    .e-listview .e-list-icon {
+    .e-de-listview.e-de-listview-icon.e-icons.e-list-icon {
         height: 24px;
         width: 16px;
         margin-right: $e-de-ctnr-break-listview-margin-right;
@@ -74790,8 +74826,8 @@ $grid-summary-row-bg-color: $content-bg-color-alt1 !default;
 $grid-sortdiv-width: 20px !default;
 $grid-sortdiv-height: 20px !default;
 $grid-sortnumber-margin: 0 2px 0 4px !default;
-$grid-fltr-sortnumber-margin: 0 4px 0 4px !default;
-$grid-fltr-sortnumber-rightalign-margin: 0 4px 0 -2px !default;
+$grid-fltr-sortnumber-margin: 0 10px 0 4px !default;
+$grid-fltr-sortnumber-rightalign-margin: 0 4px 0 -9px !default;
 $grid-sortnumber-rightalign-margin: 0 4px 0 2px !default;
 $grid-sortnumer-line-height: 16px !default;
 $grid-bigger-sortnumer-line-height: 18px !default;
@@ -74847,9 +74883,9 @@ $grid-ungroup-rtl-padding-top: 4px !default;
 $grid-bigger-ungroup-rtl-padding-top: $grid-ungroup-rtl-padding-top !default;
 $grid-rtl-group-headercell-margin-right: 0 !default;
 $grid-rtl-group-headercell-margin-left: 4px !default;
-$grid-fltr-rtl-sortnumber-margin: 0 4px 0 4px !default;
+$grid-fltr-rtl-sortnumber-margin: 0 4px 0 9px !default;
 $grid-rtl-sortnumber-margin: 0 4px 0 -18px !default;
-$grid-fltr-rtl-sortnumber-rightalign-margin: 0 4px 0 6px !default;
+$grid-fltr-rtl-sortnumber-rightalign-margin: 0 4px 0 9px !default;
 $grid-rtl-sortnumber-rightalign-margin: 0 4px 0 !default;
 $grid-rtl-sortcelldiv-margin: -13px 4px -13px -6px !default;
 $grid-rtl-sortcelldiv-right-align-margin: -13px 4px -13px -6px !default;
@@ -74859,13 +74895,13 @@ $grid-rtl-grouped-headercell-padding: 5px 0 3px !default;
 $grid-rtl-group-text-margin-left: -7px !default;
 $grid-rtl-group-sorticon-margin-right: 0 !default;
 $grid-rtl-headercell-border-width: 0 !default;
-$grid-rtl-headercelldiv-padding: 0 .4em 0 4.2em !default;
+$grid-rtl-headercelldiv-padding: 0 .4em 0 3.2em !default;
 $grid-rtl-headercelldiv-chkbox-padding: 0 .5em 0 .45em !default;
 $grid-bigger-rtl-headercelldiv-chkbox-padding: 0 .45em 0 .4em !default;
 $grid-ungroup-rtl-padding-right: -8px !default;
-$grid-headercelldiv-padding: 0 20px 0 5px !default;
+$grid-headercelldiv-padding: 0 7px 0 5px !default;
 $grid-headercelldiv-sort-centeralign-padding-right: 5px !default;
-$grid-headercell-div-padding: 0 .4em !default;
+$grid-headercell-div-padding: 0 1.6em 0 .4em !default;
 $grid-group-text-width: auto !default;
 $grid-grouptopleftcell-border-top: 2px solid !default;
 $grid-group-caption-font-size: $text-xs !default;
@@ -75031,11 +75067,11 @@ $grid-rowcell-wrap-height: 21px !default;
 $grid-rowcell-autofill-top-height: 19px !default;
 $grid-rowcell-autofill-top-bottom-height: 17px !default;
 $grid-rowcell-wrap-max-height: 36px !default;
-$grid-bigger-fltr-sortnumber-rightalign-margin: 0 6px 0 0 !default;
+$grid-bigger-fltr-sortnumber-rightalign-margin: 0 6px 0 -8px !default;
 $grid-bigger-sortnumber-rightalign-margin: 0 6px 0 6px !default;
 $grid-bigger-columnmenu-bottom: 13px !default;
 $grid-bigger-sortnumber-margin: 0 6px 0 6px !default;
-$grid-bigger-fltr-sortnumber-margin: 0 9px 0 6px !default;
+$grid-bigger-fltr-sortnumber-margin: 0 11px 0 6px !default;
 $grid-rtl-searchclear: 0 !default;
 $grid-column-chosser-searchdiv-top: -41px !default;
 $grid-reorderarrow-font-size: $text-lg !default;
@@ -75119,7 +75155,7 @@ $grid-responsive-apply-btn-top: 0 !default;
 $grid-responsive-column-menu-icon-margin-top: 4px !default;
 $grid-rtl-headercelldiv-left-align-margin: 10px !default;
 $grid-rtl-filtermenudiv-left-align-margin: -5px !default;
-$grid-rtl-sort-num-left-align-margin: 0 -1px 0 4px !default;
+$grid-rtl-sort-num-left-align-margin: 0 0 0 4px !default;
 $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
 $grid-rowcell-color: $content-text-color !default;
 $grid-header-text-transform: uppercase !default;
@@ -75700,7 +75736,7 @@ $grid-checkmark-color: $primary-text-color !default;
       .e-headercell.e-fltr-icon .e-headercelldiv .e-sortnumber {
         margin: $grid-rtl-bigger-sortnumber-withfilter-margin;
         @if $grid-skin == 'tailwind' {
-          margin-left: 0;
+          margin-left: 4px;
         }
       }
   
@@ -77040,7 +77076,17 @@ $grid-checkmark-color: $primary-text-color !default;
       text-transform: $grid-header-text-transform;
       user-select: none;
     }
-
+    
+    .e-rightalign:not(.e-fltr-icon) .e-headercelldiv {
+      padding: 0 .4em ;
+      @if $grid-skin == 'fabric' {
+        padding: 0 1px 0;
+      }
+      @if $grid-skin == 'highcontrast' {
+        padding: 0;
+      }
+    }
+    
     .e-headercelldiv.e-headerchkcelldiv {
       overflow: visible;
     }
@@ -77542,6 +77588,9 @@ $grid-checkmark-color: $primary-text-color !default;
         right: 2px;
       }
     }
+    &.e-rtl .e-sortfilter .e-rightalign .e-headercelldiv {
+      padding: $grid-headercelldiv-right-align-padding;
+    }
 
     .e-sortfilterdiv {
       float: right;
@@ -77588,7 +77637,7 @@ $grid-checkmark-color: $primary-text-color !default;
     }
 
     &.e-rtl .e-gridheader .e-sortfilter {
-      .e-centeralign.e-headercell[aria-sort="none"],
+      .e-centeralign.e-headercell[aria-sort="none"]:not(.e-centeralign),
       .e-centeralign.e-headercell:not([aria-sort]) {
         .e-headercelldiv,
         .e-stackedheadercelldiv {
@@ -78941,6 +78990,9 @@ $grid-checkmark-color: $primary-text-color !default;
           .e-headercelldiv.e-headerchkcelldiv {
             padding: $grid-rtl-headercelldiv-padding;
             text-align: right;
+            @if $grid-skin == 'highcontrast' {
+              margin: -7px 0;
+            }
 
             & .e-sortnumber {
               @include grid-flot-margin(left, $grid-fltr-rtl-sortnumber-margin);
@@ -78952,6 +79004,9 @@ $grid-checkmark-color: $primary-text-color !default;
         .e-headercelldiv.e-headerchkcelldiv {
           padding: $grid-rtl-headercelldiv-padding;
           text-align: right;
+          @if $grid-skin == 'highcontrast' {
+            margin: -7px 0;
+          }
 
           & .e-sortnumber {
             @include grid-flot-margin(left, $grid-rtl-sortnumber-margin);
@@ -78972,9 +79027,6 @@ $grid-checkmark-color: $primary-text-color !default;
 
             & .e-sortnumber {
               margin: $grid-rtl-sort-num-left-align-margin;
-              @if $grid-skin == 'bootstrap4' {
-                margin: 4px -2px 0 0;
-              }
             }
           }
 
@@ -78993,7 +79045,7 @@ $grid-checkmark-color: $primary-text-color !default;
           }
 
           & .e-headercelldiv {
-            padding: 0 25px 0 .7em;
+            padding: 0 1.6em 0 1.2em;
 
             & .e-sortnumber {
               @include grid-flot-margin(right, $grid-bigger-sort-right-margin);
@@ -98371,7 +98423,7 @@ $pv-corrupted-pop-content-margin-right: 53px !default;
 $pv-corrupted-pop-header-rtl-text-align: right !default;
 $pv-toolbar-btn-width-mobile: 36px !default;
 $pv-toolbar-btn-height-mobile: 30px !default;
-$pv-annotation-opacity-popup-background-color: $white !default;
+$pv-annotation-opacity-popup-background-color: $content-bg-color-alt1 !default;
 $pv-annotation-opacity-popup-color: $content-text-color !default;
 $pv-annotation-opacity-popup-padding: 16px !default;
 $pv-annotation-opacity-popup-min-height: 48px !default;
@@ -99335,7 +99387,9 @@ $lg-desktop: 1399.98;
   .e-pv-formdesigner-toolbar.e-toolbar .e-toolbar-items .e-toolbar-item .e-pv-tbar-btn.e-btn {
     height: $pv-toolbar-btn-height;
     min-width: $pv-toolbar-btn-width;
-    width: $pv-toolbar-btn-width;
+    @if ($skin-name != 'fluent2') {
+      width: $pv-toolbar-btn-width;
+    }
     @if $skin-name == 'FluentUI' {
       line-height: $pv-toolbar-btn-height;
       min-width: 40px;
@@ -100253,7 +100307,8 @@ $lg-desktop: 1399.98;
     padding: $pv-thumbnail-view-button-selection-padding;
   }
 
-  .e-pv-tbar-btn.e-pv-thumbnail-view-button.e-btn:focus
+  .e-pv-tbar-btn.e-pv-thumbnail-view-button.e-btn:focus,
+  .e-pv-tbar-btn.e-pv-organize-view-button.e-btn:focus
   {
     background: $pv-thumbnail-view-button-selection-background;
     border: $pv-thumbnail-view-button-selection-border;
@@ -100616,7 +100671,9 @@ $lg-desktop: 1399.98;
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item .e-menu-icon,
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item.e-focused .e-menu-icon,
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item.e-focused .e-caret,
-  .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item .e-caret {
+  .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item .e-caret,
+  .e-pv-annotation-comment-panel-container .e-pv-tbar-btn,
+  .e-pv-comment-panel-title-container .e-pv-annotation-tools-close-icon.e-pv-icon {
     color: $pv-icon-color;
     @if ($skin-name == 'bootstrap5' or $skin-name == 'bootstrap5-dark') {
       box-shadow: none;
@@ -100680,13 +100737,18 @@ $lg-desktop: 1399.98;
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item.e-focused .e-menu-icon:focus,
   .e-input-group.e-control-wrapper.e-pv-prop-dropdown.e-ddl.e-valid-input:not(.e-input-focus):hover,
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item.e-focused .e-caret:focus,
-  .e-input-group.e-control-wrapper.e-pv-prop-dropdown-rtl.e-ddl.e-valid-input:not(.e-input-focus):hover {
+  .e-input-group.e-control-wrapper.e-pv-prop-dropdown-rtl.e-ddl.e-valid-input:not(.e-input-focus):hover,
+  .e-pv-annotation-comment-panel-container .e-pv-tbar-btn:hover,
+  .e-pv-annotation-comment-panel-container .e-pv-tbar-btn:focus {
     @if $skin-name == 'bootstrap4' {
       color: $pv-icon-color-hover;
     }
     @if $skin-name == 'bootstrap5' {
       color: $white;
     }
+    @if $skin-name == 'fluent2' {
+      color: var(--color-sf-toolbar-icon-color);
+    }
     @if $skin-name == 'FluentUI' {
       color: $pv-item-selection-color;
     }
@@ -100698,7 +100760,7 @@ $lg-desktop: 1399.98;
     @if $skin-name == 'bootstrap4' {
       color: $pv-icon-color-hover;
     }
-    @if $skin-name == 'bootstrap5' {
+    @if ($skin-name == 'bootstrap5') {
       color: $pv-icon-color;
     }
     @if $skin-name == 'FluentUI' {
@@ -100706,12 +100768,23 @@ $lg-desktop: 1399.98;
     }
   }
 
+  .e-pv-toolbar .e-pv-tbar-btn.e-pv-tbar-btn:focus-visible,
+  .e-pv-annotation-toolbar .e-pv-tbar-btn.e-pv-tbar-btn:focus-visible,
+  .e-pv-formdesigner-toolbar .e-pv-tbar-btn.e-pv-tbar-btn:focus-visible {
+    @if ($skin-name == 'fluent2') {
+      color: $pv-icon-color;
+    }
+  }
+
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item:hover .e-menu-icon,
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item.e-focused:hover .e-menu-icon,
   .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item.e-focused:hover .e-caret {
     @if $skin-name == 'bootstrap4' {
       color: $pv-icon-color-hover;
     }
+    @if $skin-name == 'fluent2' {
+      color: var(--color-sf-toolbar-icon-color);
+    }
   }
 
   .e-pv-toolbar .e-toolbar-item.e-overlay .e-pv-tbar-btn.e-pv-tbar-btn .e-pv-icon,
@@ -101063,10 +101136,13 @@ $lg-desktop: 1399.98;
     border-bottom: 2px solid;
     margin-top: 0;
     padding-top: 5px;
-    @if ($skin-name=='bootstrap5'or $theme-name=='fluent2') {
+    @if ($skin-name=='bootstrap5') {
       margin-top: -4px;
       padding-top: 0;
     }
+    @if ($theme-name=='fluent2') {
+      padding-top: 0;
+    }
     @if $skin-name == 'FluentUI' {
       line-height: 11px;
     }
@@ -101078,7 +101154,12 @@ $lg-desktop: 1399.98;
       line-height: 1.71em;
     }
     border-bottom: 2px solid;
-    margin-top: 0;
+    @if ($skin-name == 'fluent2') {
+      margin-top: 5px;
+    }
+    @else {
+      margin-top: 0;
+    }
     padding-top: 1px;
     vertical-align: initial;
     @if $skin-name == 'FluentUI' {
@@ -101090,9 +101171,12 @@ $lg-desktop: 1399.98;
   .e-pv-properties-color-container-style-prop .e-btn-icon.e-pv-annotation-thickness-icon.e-pv-icon {
     margin-top: 0;
     padding-top: 7px;
-    @if $skin-name == 'bootstrap5' or $skin-name == 'FluentUI' or $theme-name == 'fluent2' {
+    @if $skin-name == 'bootstrap5' or $skin-name == 'FluentUI' {
       padding-top: 0;
     }
+    @if ( or $theme-name == 'fluent2'){
+      padding-top: 5px;
+    }
     vertical-align: initial;
   }
 
@@ -101104,6 +101188,13 @@ $lg-desktop: 1399.98;
     vertical-align: initial;
   }
 
+  .e-pv-annotation-thickness-popup-container-mobile,
+  .e-pv-annotation-opacity-popup-container-mobile {
+    @if $skin-name != 'Material3' {
+      background-color: $pv-annotation-opacity-popup-background-color;
+    }
+  }
+
   .e-pv-annotation-opacity-popup-container,
   .e-pv-annotation-thickness-popup-container {
     @if $skin-name != 'Material3' {
@@ -101462,13 +101553,6 @@ $lg-desktop: 1399.98;
     }
   }
 
-  .e-template.e-toolbar-item:not(.e-pv-shape-template-container) .e-pv-annotation-shapes-container,
-  .e-template.e-toolbar-item:not(.e-pv-calibrate-template-container) .e-pv-annotation-calibrate-container {
-    @if ($theme-name == 'fluent2') {
-      line-height: 28px;
-    }
-  }
-
   .e-pv-custom-annotation-stamp-container.e-menu-container ul .e-menu-item .e-menu-icon .e-caret,
   .e-pv-custom-annotation-stamp-container.e-menu-container ul .e-menu-item.e-focused .e-menu-icon .e-caret {
     @if ($skin-name == 'bootstrap5') {
@@ -101551,7 +101635,6 @@ $lg-desktop: 1399.98;
     line-height: $pv-prop-color-picker-line-height;
     @if ($skin-name == 'bootstrap5') {
       background: $transparent;
-      border: 1px solid $border-light;
       border-radius: 4px;
       box-sizing: border-box;
       color: $content-text-color;
@@ -101566,6 +101649,13 @@ $lg-desktop: 1399.98;
     }
   }
 
+  .e-pv-properties-line-fill-color-container .e-dropdown-btn.e-btn:disabled,
+  .e-pv-properties-line-stroke-color-container .e-dropdown-btn.e-btn:disabled{
+    @if ($skin-name == 'bootstrap5') {
+      color: $pv-icon-color;
+    }
+  }
+
   .e-bigger .e-pv-properties-line-fill-color-container .e-dropdown-btn.e-btn,
   .e-bigger .e-pv-properties-line-stroke-color-container .e-dropdown-btn.e-btn {
     @if $skin-name == 'FluentUI' {
@@ -102097,7 +102187,7 @@ $lg-desktop: 1399.98;
   .e-pv-annotation-stamp-container .e-menu-parent.e-menu .e-menu-item,
   .e-pv-annotation-stamp-container .e-menu-parent.e-menu .e-menu-item .e-pv-stamp-icon,
   .e-pv-annotation-stamp-container .e-menu-parent.e-menu .e-menu-item .e-caret {
-    @if $skin-name != 'Material3' {
+    @if ($skin-name != 'Material3' and $skin-name != 'fluent2') {
       line-height: $pv-annot-toolbar-dropdown-btn-line-height;
     }
   }
@@ -102201,14 +102291,6 @@ $lg-desktop: 1399.98;
     padding-top: $pv-dialog-pop-close-icon-padding-top-mobile;
   }
 
-  .e-pv-properties-form-field-window .e-dlg-header-content .e-btn.e-dlg-closeicon-btn,
-  .e-pv-signature-window .e-dlg-header-content .e-btn.e-dlg-closeicon-btn {
-    @if $theme-name == 'fluent2' {
-      padding-left: 24px !important;/* stylelint-disable-line declaration-no-important */
-      padding-top: 24px !important;/* stylelint-disable-line declaration-no-important */
-    }
-  }
-
   .e-pv-organize-window .e-dlg-header-content .e-btn.e-dlg-closeicon-btn{
     @if $theme-name == 'fluent2' {
       padding: 8px !important;/* stylelint-disable-line declaration-no-important */
@@ -102551,6 +102633,8 @@ $lg-desktop: 1399.98;
     padding-right: 7px;
     @if $skin-name == 'Material3' {
       font-size: $text-xs;
+      padding-left: 12px;
+      padding-right: 12px;
     }
   }
 
@@ -102693,7 +102777,7 @@ $lg-desktop: 1399.98;
   .e-pv-comments-panel-text {
     font-size: 15px;
     padding-left: 85px;
-    color: rgba(var(--color-sf-on-surface-variant));
+    color: var(--color-sf-content-text-color-alt1);
   }
 
   .e-pv-comments-content-container {
@@ -102881,8 +102965,34 @@ $lg-desktop: 1399.98;
     }
   }
 
+  .e-pv-annotation-stamp-container .e-menu-wrapper ul .e-menu-item .e-caret {
+    @if ($skin-name == 'fluent2') {
+      margin-top: -4px;
+    }
+  }
+
+  .e-pv-custom-annotation-stamp-container.e-menu-container ul .e-menu-item .e-pv-stamp-icon,
+  .e-pv-custom-annotation-stamp-container.e-menu-container ul .e-menu-item .e-caret {
+    @if ($skin-name == 'fluent2') {
+      margin-top: -5px;
+    }
+  }
+
+  .e-pv-annotation-shapes-container.e-btn.e-icon-btn,
+  .e-pv-annotation-calibrate-container.e-btn.e-icon-btn,
+  .e-pv-annotation-handwritten-container.e-btn.e-icon-btn {
+    @if ($skin-name == 'fluent2') {
+      padding-top: 8px;
+    }
+  }
+
   .e-menu-icon.e-pv-stamp-icon.e-pv-icon {
-    margin-top: $pv-stamp-icon-margin-top;
+    @if ($skin-name == 'fluent2') {
+      margin-top: -4px;
+    }
+    @else {
+      margin-top: $pv-stamp-icon-margin-top;
+    }
     @if $theme-name != 'fluent2'{
       padding-left: 7px;
     }
@@ -103206,7 +103316,9 @@ $lg-desktop: 1399.98;
     @if $skin-name == 'bootstrap5' {
       color: $pv-icon-color;
       height: 32px;
-      line-height: 32px;
+      @if ($theme-name != 'fluent2') {
+        line-height: 32px;
+      }
     }
     @else {
       color: $pv-icon-color;
@@ -103263,13 +103375,6 @@ $lg-desktop: 1399.98;
     border-color: $pv-annotation-dropdown-border-color;
   }
 
-  .e-bigger .e-pv-custom-annotation-stamp-container.e-menu-container ul .e-menu-item .e-pv-stamp-icon,
-  .e-bigger .e-pv-custom-annotation-stamp-container.e-menu-container ul .e-menu-item .e-caret {
-    @if $theme-name == 'fluent2' {
-      margin-top: -10px;
-    }
-  }
-
   .e-pv-custom-annotation-stamp-container.e-menu-container .e-ul .e-menu-item.e-selected,
   .e-pv-custom-annotation-stamp-container.e-menu-container.e-menu-container .e-ul .e-menu-item.e-focused {
     @if $skin-name == 'bootstrap4' {
@@ -103838,6 +103943,7 @@ $lg-desktop: 1399.98;
 
   .e-pv-properties-form-field-group-btn-div {
     display: grid;
+    align-content: space-between;
   }
 
   .e-pv-properties-form-field-option-dropdown-list-div {
@@ -104196,7 +104302,6 @@ $lg-desktop: 1399.98;
     }
     @if $theme-name == 'fluent2'{
       font-family: $font-family;
-      margin-left: 7px;
     }
   }
 
@@ -125187,6 +125292,7 @@ $ribbon-items-focus-box-shadow: none !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {