@syncfusion/blazor-themes 26.1.40 → 26.1.42

package/SCSS-Themes/fluent2.scss

@@ -27859,6 +27859,11 @@ $calendar-selected-month-bg-color: $primary-lighter !default;
             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,
@@ -34365,7 +34370,13 @@ $slider-button-vup-bg-image:  none !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 {
@@ -34375,7 +34386,10 @@ $slider-button-vup-bg-image:  none !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');
             }
           }
@@ -34405,7 +34419,13 @@ $slider-button-vup-bg-image:  none !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 {
@@ -34415,7 +34435,10 @@ $slider-button-vup-bg-image:  none !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');
             }
           }
@@ -34491,7 +34514,12 @@ $slider-button-vup-bg-image:  none !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%;
+              }
             }
           }
 
@@ -34517,6 +34545,10 @@ $slider-button-vup-bg-image:  none !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;
+            }
           }
         }
 
@@ -34616,7 +34648,7 @@ $slider-button-vup-bg-image:  none !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;
@@ -34706,7 +34738,7 @@ $slider-button-vup-bg-image:  none !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') {
@@ -42737,7 +42769,7 @@ $range-indicator-label-width: 100% !default;
 $range-device-indicator-margin: 8px 0 0 !default;
 $range-device-indicator-height: 24px !default;
 $range-separator-height: 1px !default;
-$range-border-value: 1px solid $content-bg-color-alt1 !default;
+$range-border-value: 1px solid $flyout-border !default;
 $range-container-border-value: none !default;
 $range-separator-margin: 0 !default;
 $range-footer-height: 47px !default;
@@ -42990,11 +43022,11 @@ $modal-range-tablet-font-size: 18px !default;
 
 $range-header-font-size: 16px !default;
 
-$footer-top-border-color :1px solid $border-light !default;
+$footer-top-border-color :1px solid $flyout-border !default;
 
 /* stylelint-disable */
 .e-daterangepicker.e-popup .e-footer{
-  border-top: 1px solid $footer-top-border-color !important;
+  border-top: $footer-top-border-color !important;
 }
 
 $range-icon-mouse-border-radius: 16px !default;
@@ -57223,7 +57255,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';
       }
     }
@@ -60392,7 +60425,7 @@ $ddt-item-hover-bg: $content-bg-color-hover !default;
 
       &.e-chip-input {
         width: 0;
-        display: none;
+        visibility: hidden;
       }
     }
 
@@ -61629,7 +61662,8 @@ $ddl-closer-margin-top-bigger-small: -1.64em !default;
 $ddl-list-box-shadow-color: rgba(0, 0, 0, .21) !default;
 $ddl-chip-selected-shadow-value: 0 2px 3px 1px $ddl-list-box-shadow-color !default;
 $ddl-chip-mobile-font: $content-text-color !default;
-$ddl-chip-bg-color: $content-bg-color-alt3 !default;
+$ddl-chip-bg-color: $chip-bg-color !default;
+$dd-chip-border: 1px solid $chip-border-color !default;
 $ddl-chip-hover-bg-color: $content-bg-color-alt4 !default;
 $ddl-chip-hover-font-color: $content-text-color-hover !default;
 $ddl-sel-hover-chip-bg-color:  $content-bg-color-alt5 !default;
@@ -63938,6 +63972,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;
 }
@@ -71992,7 +72029,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;
@@ -77818,8 +77855,8 @@ $grid-columnchooser-input-padding-left: 4px !default;
 $grid-columnchooser-ul-margin: 0 !default;
 $grid-column-chooser-dlg-footer-padding: 8px !default;
 $grid-rtl-bigger-sortnumber-margin: 2px 0 0 -10px !default;
-$grid-rtl-bigger-sortnumber-withfilter-margin:  2px 4px 0 4px !default;
-$grid-rtl-bigger-rightalign-sortnumber-margin: 2px 0 0 5px !default;
+$grid-rtl-bigger-sortnumber-withfilter-margin:  2px 4px 0 17px !default;
+$grid-rtl-bigger-rightalign-sortnumber-margin: 2px 0 0 17px !default;
 $grid-rtl-group-text-marign-right: 0 !default;
 $grid-rtl-group-text-margin-right: 0 !default;
 $grid-rtl-textwrap-srotnumber-margin: 2px 5px 0 2px !default;
@@ -77975,8 +78012,8 @@ $grid-summary-row-bg-color: $content-bg-color-alt2 !default;
 $grid-sortdiv-width: 20px !default;
 $grid-sortdiv-height: 20px !default;
 $grid-sortnumber-margin: 2px 4px 0 4px !default;
-$grid-fltr-sortnumber-margin: 2px 0 0 4px !default;
-$grid-fltr-sortnumber-rightalign-margin: 2px 4px 0 2px !default;
+$grid-fltr-sortnumber-margin: 2px 4px 0 4px !default;
+$grid-fltr-sortnumber-rightalign-margin: 2px 4px 0 0 !default;
 $grid-sortnumber-rightalign-margin: 2px 4px 0 6px !default;
 $grid-sortnumer-line-height: 16px !default;
 $grid-bigger-sortnumer-line-height: 18px !default;
@@ -78033,9 +78070,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: 8px !default;
 $grid-rtl-group-headercell-margin-left: 0 !default;
-$grid-fltr-rtl-sortnumber-margin: 2px 0 0 -15px !default;
+$grid-fltr-rtl-sortnumber-margin: 2px 0 0 19px !default;
 $grid-rtl-sortnumber-margin: 2px 4px 0 -7px !default;
-$grid-fltr-rtl-sortnumber-rightalign-margin: 2px 0 0 -14px !default;
+$grid-fltr-rtl-sortnumber-rightalign-margin: 2px 0 0 19px !default;
 $grid-rtl-sortnumber-rightalign-margin: 2px 4px 0 !default;
 $grid-rtl-sortcelldiv-margin: -13px 4px -13px -6px !default;
 $grid-rtl-sortcelldiv-right-align-margin: -13px 4px -13px -6px !default;
@@ -78045,13 +78082,13 @@ $grid-rtl-grouped-headercell-padding: 2px 0 3px !default;
 $grid-rtl-group-text-margin-left: -7px !default;
 $grid-rtl-group-sorticon-margin-right: -5px !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 1.2em !default;
 $grid-rtl-headercelldiv-chkbox-padding: 0 .5em 0 .45em !default;
 $grid-bigger-rtl-headercelldiv-chkbox-padding: 0 .33em 0 .4em !default;
 $grid-ungroup-rtl-padding-right: -10px !default;
-$grid-headercelldiv-padding: 0 18px 0 5px !default;
+$grid-headercelldiv-padding: 0 9px 0 5px !default;
 $grid-headercelldiv-sort-centeralign-padding-right: 5px !default;
-$grid-headercell-div-padding: 0 .4em !default;
+$grid-headercell-div-padding: 0 1.5em 0 .4em !default;
 $grid-group-text-width: auto !default;
 $grid-grouptopleftcell-border-top: 2px solid !default;
 $grid-group-caption-font-size: $text-sm !default;
@@ -78155,8 +78192,8 @@ $grid-bigger-fltrdiv-margin: -15px -4px -15px 6px !default;
 $grid-icon-save: 'e964' !default;
 $grid-sortdiv-filtericon-margin: -13px 21px -13px 4px !default;
 $grid-sortdiv-filtericon-rightalign-margin: -13px 4px -13px -5px !default;
-$grid-rtl-sortdiv-filtericon-rightalign-margin: -13px 4px -13px 15px !default;
-$grid-rtl-sortdiv-filtericon-margin: -13px 4px -13px 15px !default;
+$grid-rtl-sortdiv-filtericon-rightalign-margin: -13px 4px -13px 12px !default;
+$grid-rtl-sortdiv-filtericon-margin: -13px 4px -13px 12px !default;
 $grid-bigger-fltricon-sortdiv-rightalign-margin: -15px 6px -15px -5px !default;
 $grid-bigger-fltricon-sortdiv-margin: -15px 23px -15px 6px !default;
 $grid-rtl-bigger-fltricon-sortdiv-margin: -15px 6px -15px 12px !default;
@@ -78217,11 +78254,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: 2px 6px 0 2px !default;
+$grid-bigger-fltr-sortnumber-rightalign-margin: 2px 6px 0 0 !default;
 $grid-bigger-sortnumber-rightalign-margin: 2px 6px 0 8px !default;
 $grid-bigger-columnmenu-bottom: 13px !default;
 $grid-bigger-sortnumber-margin: 2px 2px 0 6px !default;
-$grid-bigger-fltr-sortnumber-margin: 2px 2px 0 6px !default;
+$grid-bigger-fltr-sortnumber-margin: 2px 7px 0 6px !default;
 $grid-rtl-searchclear: 0 !default;
 $grid-column-chosser-searchdiv-top: -41px !default;
 $grid-reorderarrow-font-size: $text-xxs !default;
@@ -78891,7 +78928,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;
         }
       }
   
@@ -80231,7 +80268,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;
     }
@@ -80733,6 +80780,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;
@@ -80779,7 +80829,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 {
@@ -82132,6 +82182,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);
@@ -82143,6 +82196,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);
@@ -82163,9 +82219,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;
-              }
             }
           }
 
@@ -82184,7 +82237,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);
@@ -101595,7 +101648,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;
@@ -101778,14 +101831,14 @@ $pv-input-active-color: rgba($primary, .54) !default;
 $pv-input-hover-background: $transparent !default;
 $pv-input-hover-color: rgba($primary, .54) !default;
 $pv-input-background: $transparent !default;
-$pv-bookmark-container-background-color: var(--color-sf-white) !default;
+$pv-bookmark-container-background-color: $content-bg-color-alt1 !default;
 $pv-nav-toolbar-text-color: rgba($primary, .87) !default;
-$pv-bookmark-container-border: 1px solid $primary !default;
+$pv-bookmark-container-border: 1px solid $border-light !default;
 $pv-bookmark-list-border-bottom: 1px solid var(--color-sf-border-alt) !default;
 $pv-annotation-opacity-popup-box-shadow: 0 3px 8px 0 $content-bg-color-hover !default;
 $pv-annotation-dropdown-background-color: $transparent !default;
 $pv-annotation-dropdown-border-color: $transparent !default;
-$pv-annotation-dropdown-background-color-hover: $content-bg-color-alt3 !default;
+$pv-annotation-dropdown-background-color-hover: var(--color-sf-content-bg-color-hover) !default;
 $pv-annotation-dropdown-border-color-hover: $content-bg-color-alt3 !default;
 $pv-annotation-dropdown-background-color-active: $content-bg-color-alt2 !default;
 $pv-annotation-dropdown-border-color-active: $transparent !default;
@@ -102560,7 +102613,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;
@@ -103478,7 +103533,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;
@@ -103841,7 +103897,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;
@@ -103905,13 +103963,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;
     }
@@ -103923,7 +103986,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' {
@@ -103931,12 +103994,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,
@@ -104288,10 +104362,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;
     }
@@ -104303,7 +104380,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' {
@@ -104315,9 +104397,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;
   }
 
@@ -104329,6 +104414,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' {
@@ -104687,13 +104779,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') {
@@ -104776,7 +104861,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;
@@ -104791,6 +104875,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' {
@@ -105322,7 +105413,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;
     }
   }
@@ -105426,14 +105517,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 */
@@ -105776,6 +105859,8 @@ $lg-desktop: 1399.98;
     padding-right: 7px;
     @if $skin-name == 'Material3' {
       font-size: $text-xs;
+      padding-left: 12px;
+      padding-right: 12px;
     }
   }
 
@@ -105918,7 +106003,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 {
@@ -106106,8 +106191,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;
     }
@@ -106431,7 +106542,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;
@@ -106488,13 +106601,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' {
@@ -107063,6 +107169,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 {
@@ -107421,7 +107528,6 @@ $lg-desktop: 1399.98;
     }
     @if $theme-name == 'fluent2'{
       font-family: $font-family;
-      margin-left: 7px;
     }
   }
 
@@ -128437,6 +128543,7 @@ $ribbon-gallery-button-selected-icon-color: $icon-color !default;
 
     .e-disabled {
       opacity: $ribbon-disabled-opacity;
+      pointer-events: none;
     }
 
     .e-input-group {