@syncfusion/ej2-navigations 16.4.45 → 16.4.52-46585

package/styles/toolbar/_layout.scss

@@ -1,89 +1,118 @@
-@include export-module('toolbar-layout') {
+@include export-module('toolbar-layout') {
+
   /*! toolbar layout */
-  // sass-lint:disable no-vendor-prefixes
-  .e-bigger #{&}.e-toolbar,
-  #{&}.e-toolbar.e-bigger {
+  /* stylelint-disable property-no-vendor-prefix */
+  .e-bigger .e-toolbar,
+  .e-toolbar.e-bigger {
     height: $tbar-bgr-size;
     min-height: $tbar-bgr-size;
 
-    .e-icons {
-      font-size: $tbar-icons-bgr-font-size;
-    }
+    .e-toolbar-items {
 
-    &.e-extended-toolbar.e-tbar-extended {
-      border-bottom: 0;
-      border-bottom-left-radius: 0;
-      border-bottom-right-radius: 0;
+      &:not(.e-tbar-pos):not(.e-toolbar-multirow),
+      .e-toolbar-left {
 
-      .e-toolbar-extended {
-        border-top: 0;
-        border-top-left-radius: 0;
-        border-top-right-radius: 0;
+        .e-toolbar-item:first-child {
+          margin-left: $tbar-item-bgr-mrgn;
+        }
       }
-    }
 
-    &.e-toolpop.e-rtl {
+      .e-hscroll-bar .e-hscroll-content {
 
-      .e-toolbar-items:not(.e-tbar-pos) {
+        > .e-toolbar-item:last-child {
+          margin-right: $tbar-item-bgr-mrgn;
+        }
 
-        .e-toolbar-center .e-toolbar-item {
-          margin: 0;
+        .e-toolbar-right .e-toolbar-item {
+
+          &:last-child {
+            margin-right: $tbar-item-bgr-mrgn;
+          }
         }
+      }
 
-        .e-toolbar-right .e-toolbar-item:last-child {
-          margin: 0;
-          margin-left: $tbar-item-nrml-mrgn;
+      &.e-toolbar-multirow {
+        margin-left: $tbar-multirow-items-mrgn-bigger;
+        margin-right: $tbar-multirow-items-mrgn-bigger;
+
+        .e-toolbar-item:not(.e-separator) {
+          margin: $tbar-multirow-item-top-btm-mrgn-bigger;
         }
+      }
 
-        .e-toolbar-right .e-toolbar-item {
-          margin: 0;
+      .e-toolbar-item {
+
+        .e-tbar-btn.e-btn,
+        .e-tbar-btn.e-btn.e-control {
+
+          &:focus,
+          &:hover,
+          &:active {
+            padding: $tbar-btn-bgr-focus-padding;
+          }
         }
       }
     }
 
-    &.e-rtl {
+    .e-toolbar-item {
+      min-height: $tbar-bgr-items-size;
 
-      .e-toolbar-items {
+      .e-tbar-btn.e-btn,
+      .e-tbar-btn.e-btn.e-control {
+        min-height: $tbar-btn-bgr-minheight;
+        min-width: $tbar-btn-bgr-minwidth;
+        padding: $tbar-btn-bgr-padding;
+        line-height: $tbar-btn-bgr-line-height;
 
-        .e-hscroll-bar .e-hscroll-content {
+        .e-tbar-btn-text {
+          padding: $btn-txt-bgr-padding;
+          font-size: $tbar-bgr-btn-text-font-size;
+        }
 
-          > .e-toolbar-item:last-child {
-            margin-left: $tbar-item-bgr-mrgn;
-            margin-right: initial;
-          }
+        .e-icons {
+          font-size: $tbar-icons-bgr-font-size;
 
-          .e-toolbar-center .e-toolbar-item {
-            margin: 0;
+          &.e-btn-icon {
+            font-size: $tbar-bgr-btn-icon-font-size;
+            line-height: $tbar-btn-icon-bgr-line-height;
           }
+        }
 
-          .e-toolbar-right .e-toolbar-item:last-child {
-            margin-left: $tbar-item-bgr-mrgn;
-            margin-right: 0;
+        &.e-tbtn-txt {
+
+          .e-icons.e-btn-icon {
+            padding: $tbar-btn-icn-bgr-padding;
           }
 
-          .e-toolbar-right .e-toolbar-item {
-            margin: 0;
+          .e-icons.e-icon-right.e-btn-icon {
+            padding: $tbar-btn-icn-right-bgr-padding;
           }
         }
+      }
 
-        .e-toolbar-left {
-
-          .e-toolbar-item:first-child {
-            margin-left: 0;
-         }
+      &:not(.e-separator) {
+        min-width: $tbar-bgr-item-size;
+        padding: $tbar-item-bgr-padding;
+      }
 
-          .e-toolbar-item:last-child {
-            margin-left: $tbar-item-nrml-mrgn;
-         }
+      &.e-separator {
+        height: $tbar-separator-bgr-height;
+        margin: $tbar-separator-bgr-mrgn;
+        min-height: $tbar-separator-bgr-minheight;
       }
 
-        &:not(.e-tbar-pos) {
+      &.e-popup-text {
 
-          .e-toolbar-item:first-child {
-            margin-left: 0;
-            margin-right: $tbar-item-bgr-mrgn;
+        .e-tbar-btn.e-btn,
+        .e-tbar-btn.e-btn.e-control {
+
+          &.e-tbtn-txt {
+
+            .e-icons.e-btn-icon {
+              padding: $tbar-popup-bgr-text-btn-icon-padding;
+            }
           }
-      }
+        }
       }
     }
 
@@ -92,368 +121,467 @@
       min-width: $tbar-nav-bgr-width;
     }
 
-    .e-toolbar-item {
+    &.e-vertical {
 
-      .e-tbar-btn.e-btn {
-        line-height: $tbar-btn-bgr-line-height;
-      }
+      .e-toolbar-items {
+
+        &:not(.e-tbar-pos) .e-toolbar-item {
+
+          &:first-child {
+            margin-left: 0;
+          }
 
-      .e-btn.e-tbar-btn .e-icons.e-btn-icon {
-        line-height: $tbar-btn-icon-bgr-line-height;
-        min-height: $tbar-btn-icon-bgr-height;
-        min-width: $tbar-btn-icon-bgr-width;
+          &:last-child {
+            margin-right: 0;
+          }
+        }
       }
-    }
 
-    .e-toolbar-items .e-toolbar-item {
+      .e-toolbar-item {
 
-      .e-tbar-btn-text {
-        line-height: $tbar-btn-txt-line-height;
+        &:not(.e-separator) {
+          min-height: 38px;
+        }
 
-        @if $skin-name == 'bootstrap' {
-          line-height: inherit;
+        &.e-separator {
+          height: auto;
+          margin: $tbar-separator-vertical-bgr-mrgn;
+          min-height: auto;
         }
       }
+
+      .e-hor-nav {
+        min-height: 40px;
+        min-width: 50px;
+      }
     }
 
     .e-toolbar-pop {
 
       .e-toolbar-item {
-        @if $skin-name == 'material' {
-          height: 48px;
-        }
+        height: $tbar-popup-bgr-height;
 
         &:not(.e-separator) {
           min-width: 48px;
           padding: $tbar-item-pop-bgr-padding;
-          }
-
-        .e-tbar-btn .e-icons.e-btn-icon {
-          min-width: $tbar-btn-icon-bgr-width;
+          min-height: $tbar-btn-pop-bgr-minheight;
         }
 
         .e-tbar-btn.e-btn {
           min-height: $tbar-btn-pop-bgr-minheight;
           padding: $tbar-pop-btn-bgr-padding;
-          @if $skin-name == 'bootstrap' {
-            line-height: 34px;
-          }
+          min-width: 100%;
 
           .e-icons.e-btn-icon {
             margin-left: $tbar-zero-value;
             padding: $tbar-pop-icon-bgr-padding;
-          }
-
-          .e-icon-left {
-            @if $skin-name == 'material' {
-              padding-right: 16px;
-            }
+            font-size: $tbar-popup-bgr-btn-icon-font-size;
           }
 
           .e-tbar-btn-text {
             padding: $tbar-pop-btn-txt-bgr-pad;
+            font-size: $tbar-popup-bgr-btn-text-font-size;
           }
         }
       }
     }
 
-    .e-toolbar-items {
-      min-height: $tbar-bgr-items-size;
-
-      &.e-toolbar-multirow {
+    &.e-extended-toolbar {
 
-        margin-left: $tbar-multirow-items-mrgn-bigger;
-        margin-right: $tbar-multirow-items-mrgn-bigger;
-        white-space: normal;
+      .e-toolbar-extended {
+        min-height: $tbar-bgr-size;
+        padding-bottom: 0;
+        padding-left: $tbar-item-bgr-mrgn;
+        padding-right: $tbar-item-bgr-mrgn;
+        padding-top: 0;
 
-        .e-toolbar-item:not(.e-separator) {
-          @if $skin-name == 'fabric' or $skin-name == 'highcontrast' {
-            margin: $tbar-multirow-item-top-btm-mrgn-bigger;
-          }
-        }
+        .e-toolbar-item {
+          min-height: $tbar-bgr-items-size;
 
-        .e-toolbar-item.e-separator.e-multirow-separator {
-          display: none;
-        }
+          .e-tbar-btn.e-btn,
+          .e-tbar-btn.e-btn.e-control {
+            min-height: $tbar-btn-bgr-minheight;
+            min-width: $tbar-btn-bgr-minwidth;
+            padding: $tbar-btn-bgr-padding;
 
-        .e-toolbar-item.e-separator {
-          display: inline-flex;
-        }
+            .e-tbar-btn-text {
+              padding: $btn-txt-bgr-padding;
+            }
 
-      }
+            &:hover,
+            &:focus,
+            &:active {
+              padding: $tbar-bgr-btn-focus-padding;
+            }
+          }
 
-      &.e-toolbar-multirow:not(.e-tbar-pos) {
+          &:not(.e-separator) {
+            min-width: $tbar-bgr-item-size;
+            padding: $tbar-item-bgr-padding;
+          }
 
-        .e-toolbar-item:first-child {
-          margin-left: $tbar-multirow-item-mrgn;
+          &.e-separator {
+            height: $tbar-separator-bgr-height;
+            margin: $tbar-separator-bgr-mrgn;
+            min-height: $tbar-separator-bgr-minheight;
+          }
         }
+      }
 
-        .e-toolbar-item:last-child {
-          margin-right: $tbar-multirow-item-mrgn;
+      &.e-tbar-extended {
+        border-bottom: 0;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+  
+        .e-toolbar-extended {
+          border-top: 0;
+          border-top-left-radius: 0;
+          border-top-right-radius: 0;
         }
-
       }
+    }
 
-      .e-hscroll-bar .e-hscroll-content {
+    &.e-rtl {
 
-        > .e-toolbar-item:last-child {
-          margin-right: $tbar-item-bgr-mrgn;
-        }
+      .e-toolbar-item {
 
-        .e-toolbar-center .e-toolbar-item {
-          margin: 0;
-        }
+        .e-tbar-btn.e-btn {
 
-        .e-toolbar-right .e-toolbar-item:last-child {
-          margin-right: $tbar-item-bgr-mrgn;
-        }
+          &.e-tbtn-txt {
 
-        .e-toolbar-right .e-toolbar-item {
-          margin: 0;
-        }
-      }
+            .e-icons.e-btn-icon {
+              padding: $tbar-rtl-btn-icn-bgr-padding;
 
-      .e-toolbar-left {
+              &.e-icon-right {
+                padding: $tbar-rtl-btn-icn-right-bgr-padding;
+              }
+            }
+          }
 
-        .e-toolbar-item:first-child {
-          margin-left: $tbar-item-bgr-mrgn;
+          .e-tbar-btn-text {
+            padding: $btn-rtl-txt-bgr-padding;
+          }
         }
       }
 
-      &:not(.e-tbar-pos) {
+      .e-toolbar-items {
 
-        .e-toolbar-item:first-child {
-          margin-left: $tbar-item-bgr-mrgn;
-          }
-      }
+        .e-hscroll-bar .e-hscroll-content {
 
-      &.e-tbar-pos {
-        .e-toolbar-left,
-        .e-toolbar-center,
-        .e-toolbar-right {
-          @if $skin-name == 'bootstrap' {
-            top: 1px;
+          > .e-toolbar-item:last-child {
+            margin-left: $tbar-item-bgr-mrgn;
+            margin-right: initial;
           }
-        }
-      }
 
-      .e-toolbar-item {
-        min-height: $tbar-bgr-items-size;
+          .e-toolbar-center .e-toolbar-item {
+            margin: 0;
+          }
 
-        &:not(.e-separator) {
-          min-width: $tbar-bgr-item-size;
-          padding: $tbar-item-bgr-padding;
-        }
+          .e-toolbar-right .e-toolbar-item {
+            margin: 0;
 
-        &.e-separator {
-          height: $tbar-separator-bgr-height;
-          margin: $tbar-separator-bgr-mrgn;
-          min-height: $tbar-separator-bgr-minheight;
+            &:last-child {
+              margin-left: $tbar-item-bgr-mrgn;
+              margin-right: 0;
+            }
+          }
         }
 
-        &.e-popup-text {
-
-          .e-tbar-btn.e-btn,
-          .e-tbar-btn.e-btn.e-control {
-
-            &.e-tbtn-txt {
+        &:not(.e-tbar-pos) {
 
-              .e-icons.e-btn-icon {
-                padding: $tbar-zero-value;
-             }
-          }
+          .e-toolbar-item:first-child {
+            margin-left: 0;
+            margin-right: $tbar-item-bgr-mrgn;
           }
         }
+      }
+    }
 
-        .e-tbar-btn.e-btn,
-        .e-tbar-btn.e-btn.e-control {
-          height: $tbar-btn-bgr-height;
-          margin: $tbar-btn-bgr-mrgn;
-          min-height: $tbar-btn-bgr-minheight;
-          min-width: $tbar-btn-bgr-minwidth;
-          padding: $tbar-btn-bgr-padding;
+    &.e-extended-toolbar.e-rtl {
 
-          @if $skin-name == 'bootstrap' {
-            line-height: 34px;
+      .e-toolbar-extended {
+        padding-right: $tbar-item-bgr-mrgn;
+      }
+    }
+  }
 
-            &:focus {
-              padding: 0 6px;
-            }
+  .e-toolbar {
+    border-radius: $tbar-radius;
+    display: block;
+    height: $tbar-nrml-size;
+    min-height: $tbar-nrml-size;
+    position: relative;
+    user-select: none;
+    white-space: nowrap;
+    overflow: hidden;
 
-            &:hover {
-              padding: 0 6px;
-            }
+    .e-blazor-toolbar-items {
+      position: absolute;
+      top: -9999px;
+      visibility: hidden;
+    }
 
-            &:active {
-              padding: 0 6px;
-            }
-          }
+    &.e-control[class *= 'e-toolbar'] {
+      box-sizing: content-box;
+    }
 
-          &.e-tbtn-txt {
+    &.e-corner {
+      border-radius: $tbar-border-radius;
+    }
 
-            .e-icons.e-btn-icon {
-              padding: $tbar-btn-icn-bgr-padding;
-            }
+    &.e-hidden {
+      display: none;
+    }
 
-            .e-icons.e-icon-right.e-btn-icon {
-              padding: $tbar-btn-icn-right-bgr-padding;
-            }
+    .e-toolbar-items {
+      border-radius: $tbar-radius 0 0 $tbar-radius;
+      display: inline-flex;
+      height: 100%;
+      vertical-align: middle;
+      align-items: center;
+
+      &.e-toolbar-multirow {
+        margin-bottom: 1px;
+        margin-left: $tbar-multirow-items-mrgn-small;
+        margin-right: $tbar-multirow-items-mrgn-small;
+        white-space: normal;
+        flex-wrap: wrap;
+
+        .e-toolbar-item {
+
+          &:not(.e-separator) {
+            margin: $tbar-multirow-item-top-btm-mrgn-small;
           }
 
-          .e-tbar-btn-text {
-            padding: $btn-txt-bgr-padding;
+          &.e-separator {
+
+            &.e-multirow-separator,
+            &.e-hidden {
+              display: none;
+            }
           }
-         }
-       }
-     }
+        }
+      }
 
-    &.e-extended-toolbar {
+      &.e-multirow-pos {
 
-      .e-toolbar-extended {
+        .e-toolbar-left,
+        .e-toolbar-center,
+        .e-toolbar-right {
+          display: inline;
+        }
+      }
 
-        min-height: $tbar-bgr-size;
-        padding-bottom: 0;
-        padding-left: $tbar-item-bgr-mrgn;
-        padding-right: $tbar-item-bgr-mrgn;
-        padding-top: 0;
+      &.e-tbar-pos {
+        display: block;
 
-        @if $skin-name != 'material' {
-          margin-left: -1px;
+        .e-toolbar-left,
+        .e-toolbar-center,
+        .e-toolbar-right {
+          display: table;
+          height: 100%;
+          top: 0;
         }
 
-      }
+        .e-toolbar-right,
+        .e-toolbar-left {
+          position: absolute;
+        }
 
-      .e-toolbar-extended.e-popup-close {
-        display: none;
-      }
+        .e-toolbar-right {
+          right: 0;
+        }
 
-      .e-toolbar-extended.e-popup-open {
-        display: inline;
+        .e-toolbar-left {
+          left: 0;
+        }
+
+        .e-toolbar-center {
+          margin: 0 auto;
+        }
       }
 
-      .e-toolbar-pop.e-toolbar-extended {
-        width: inherit;
+      .e-toolbar-left,
+      .e-toolbar-center,
+      .e-toolbar-right {
+        display: inline-block;
       }
 
-      .e-toolbar-extended {
-        box-shadow: none;
-        display: inline;
-        white-space: normal;
+      .e-toolbar-left,
+      &:not(.e-tbar-pos):not(.e-toolbar-multirow) {
 
-        .e-toolbar-item:not(.e-separator) {
+        .e-toolbar-item:first-child {
+          margin-left: $tbar-item-nrml-mrgn;
+        }
+      }
 
-          @if $skin-name == 'fabric' or $skin-name == 'highcontrast' {
-            margin: $tbar-item-bgr-padding-bigger;
-          }
+      &:first-child:not(.e-toolbar-multirow) {
 
-          min-width: $tbar-bgr-item-size;
-          padding: $tbar-item-bgr-padding;
+        > .e-toolbar-item:last-child,
+        > .e-toolbar-right .e-toolbar-item:last-child {
+          margin-right: $tbar-item-nrml-mrgn;
         }
+      }
 
-        .e-toolbar-item.e-separator.e-extended-separator {
-          display: none;
+      .e-hscroll-bar .e-hscroll-content {
+        touch-action: pan-y pinch-zoom;
+
+        > .e-toolbar-item:last-child {
+          margin-right: $tbar-item-nrml-mrgn;
         }
 
-        .e-toolbar-item.e-separator {
-          display: inline-flex;
+        .e-toolbar-center .e-toolbar-item {
+          margin: 0;
         }
 
-        .e-toolbar-item {
-          align-content: center;
-          align-items: center;
-          cursor: pointer;
-          display: inline-flex;
-          min-height: $tbar-bgr-items-size;
-          vertical-align: middle;
-          width: auto;
+        .e-toolbar-right .e-toolbar-item {
+          margin: 0;
 
-          .e-tbar-btn.e-btn .e-tbar-btn-text,
-          .e-tbar-btn.e-btn.e-control .e-tbar-btn-text {
-            padding: $btn-txt-bgr-padding;
+          &:last-child {
+            margin-right: $tbar-item-nrml-mrgn;
           }
+        }
+      }
+    }
 
-          .e-tbar-btn.e-btn,
-          .e-tbar-btn.e-btn.e-control {
-            height: $tbar-btn-bgr-height;
-            margin: $tbar-btn-bgr-mrgn;
-            min-height: $tbar-btn-bgr-minheight;
-            min-width: $tbar-btn-bgr-minwidth;
-            padding: $tbar-btn-bgr-padding;
-
-            @if $skin-name == 'bootstrap' {
+    .e-toolbar-item {
+      align-content: center;
+      align-items: center;
+      cursor: pointer;
+      display: inline-flex;
+      min-height: $tbar-nrml-item-size;
+      vertical-align: middle;
+      width: auto;
 
-              &:focus {
-                padding: 0 6px;
-              }
+      .e-tbar-btn {
+        display: flex;
+        align-items: center;
+        vertical-align: middle;
+        justify-content: center;
+        margin: $tbar-btn-nrml-mrgn;
+        min-height: $tbar-btn-nrml-minheight;
+        min-width: $tbar-btn-nrml-minwidth;
+        padding: $tbar-btn-nrml-padding;
+        border-radius: $tbar-nrml-btn-border-radius;
+        line-height: $tbar-btn-nrml-line-height;
+        border: $tbar-btn-border;
+        cursor: pointer;
+        font-size: $tbar-btn-font-size;
+        font-weight: $tbar-btn-weight;
+        overflow: hidden;
+        text-align: center;
+        text-decoration: none;
+        text-transform: none;
 
-              &:hover {
-                padding: 0 6px;
-              }
+        &.e-tbtn-txt {
 
-              &:active {
-                padding: 0 6px;
-              }
+          .e-icons.e-btn-icon {
+            padding: $tbar-btn-icn-nrml-padding;
 
+            &.e-icon-right {
+              padding: $tbar-btn-icn-right-nrml-padding;
             }
-
           }
+        }
 
-          .e-tbar-btn.e-btn {
-            line-height: $tbar-btn-bgr-line-height;
-          }
+        .e-icons.e-btn-icon {
+          margin: $tbar-zero-value;
+          min-width: $tbar-btn-icon-nrml-width;
+          width: auto;
+          font-size: $tbar-btn-font-size;
+          line-height: $tbar-btn-icon-nrml-line-height;
+        }
 
+        &:hover,
+        &:focus,
+        &:active {
+          padding: $tbar-nrml-btn-focus-padding;
         }
 
-        .e-toolbar-item.e-separator {
-          height: $tbar-separator-bgr-height;
-          margin: $tbar-separator-bgr-mrgn;
-          min-height: $tbar-separator-bgr-minheight;
+        &:focus {
+          outline: $tbar-nrml-btn-focus-outline;
         }
 
-        .e-toolbar-item .e-btn.e-tbar-btn .e-icons.e-btn-icon {
-          line-height: $tbar-btn-icon-bgr-line-height;
-          min-height: $tbar-btn-icon-bgr-height;
-          min-width: $tbar-btn-icon-bgr-width;
+        div {
+          vertical-align: middle;
         }
+  
+        .e-tbar-btn-text {
+          font-size: $tbar-btn-txt-font-size;
+          padding: $btn-txt-nrml-padding;
+        }
+      }
 
+      &:not(.e-separator) {
+        height: inherit;
+        min-width: $tbar-item-nrml-minwidth;
+        padding: $tbar-item-nrml-padding;
       }
-    }
 
-    &.e-extended-toolbar.e-rtl {
+      &.e-separator {
+        margin: $tbar-separator-nrml-mrgn;
+        min-height: $tbar-separator-nrml-minheight;
+        min-width: 1px;
+        height: $tbar-separator-nrml-height;
 
-      .e-hor-nav {
-        left: 0;
-        right: auto;
+        + .e-separator,
+        &:last-of-type,
+        &:first-of-type {
+          display: none;
+        }
       }
 
-      .e-toolbar-extended {
+      &.e-popup-text {
 
-        padding-right: $tbar-item-bgr-mrgn;
-        @if $skin-name != 'material'  {
-          margin-left: 0;
+        .e-tbar-btn.e-btn.e-tbtn-txt {
+
+          .e-icons.e-btn-icon {
+            padding: $tbar-popup-text-btn-icon-padding;
+          }
         }
+      }
+
+      > * {
+        text-overflow: ellipsis;
+      }
+
+      &.e-hidden {
+        display: none;
+      }
 
+      input[type = 'checkbox'] {
+        height: auto;
       }
     }
 
     &.e-vertical {
+      display: flex;
+      flex-direction: column;
 
       .e-toolbar-items {
 
-        .e-toolbar-item {
+        .e-vscroll-bar .e-vscroll-content {
+          touch-action: pan-x pinch-zoom;
+        }
 
-          &:not(.e-separator) {
-            min-height: 38px;
-          }
+        &.e-tbar-pos {
 
-          &.e-separator {
+          .e-toolbar-left,
+          .e-toolbar-center,
+          .e-toolbar-right {
             height: auto;
-            margin: $tbar-separator-vertical-bgr-mrgn;
-            min-height: auto;
           }
 
-          .e-tbar-btn.e-btn {
-            margin: $tbar-v-btn-bgr-mrgn;
+          .e-toolbar-left {
+            left: auto;
+            right: auto;
+            top: 0;
+          }
+
+          .e-toolbar-right {
+            bottom: 0;
+            left: auto;
+            right: auto;
           }
         }
 
@@ -467,260 +595,90 @@
             margin-right: 0;
           }
         }
-      }
 
-      .e-hor-nav {
-        min-height: 40px;
-        min-width: 50px;
-      }
-    }
-  }
+        .e-toolbar-item {
+          display: flex;
+          height: auto;
 
-  #{&}.e-toolbar {
-    border-radius: $tbar-radius;
-    display: block;
-    height: $tbar-nrml-size;
-    min-height: $tbar-nrml-size;
-    position: relative;
-    touch-action: none;
-    user-select: none;
-    white-space: nowrap;
+          &:not(.e-separator) {
+            min-width: 33px;
+          }
 
-    &.e-extended-toolbar.e-rtl {
+          &.e-separator {
+            height: auto;
+            margin: $tbar-separator-vertical-nrml-mrgn;
+            min-height: auto;
+          }
+        }
+      }
 
       .e-hor-nav {
+        bottom: 0;
+        height: auto;
         left: 0;
+        min-height: 40px;
+        min-width: 50px;
         right: auto;
+        top: auto;
+        width: auto;
       }
 
-      .e-toolbar-extended {
-        padding-right: $tbar-item-nrml-mrgn;
+      &.e-rtl.e-tbar-pos {
 
-        @if $skin-name != 'material'  {
-          margin-left: 0;
+        .e-toolbar-left {
+          bottom: 0;
+          top: auto;
         }
 
-        .e-toolbar-item .e-tbar-btn.e-btn .e-icon-left {
-          padding-left: 0;
+        .e-toolbar-right {
+          bottom: auto;
+          top: 0;
         }
-
       }
-
     }
 
-    &.e-extended-toolbar {
-
-      &.e-extended-toolbar.e-tbar-extended {
-        border-bottom: 0;
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
-      }
+    .e-hor-nav {
+      align-items: center;
+      border-radius: 0 $tbar-radius $tbar-radius 0;
+      cursor: pointer;
+      display: flex;
+      height: 100%;
+      min-height: $tbar-nrml-items-size;
+      overflow: hidden;
+      position: absolute;
+      right: $tbar-zero-value;
+      top: $tbar-zero-value;
+      width: $tbar-nav-nrml-width;
 
-      .e-hor-nav.e-ie-align {
+      &.e-ie-align {
         display: table;
       }
+    }
 
-      .e-toolbar-extended {
-        border-top: 0;
-        border-top-left-radius: 0;
-        border-top-right-radius: 0;
-        min-height: $tbar-nrml-size;
-        padding-bottom: 0;
-        padding-left: $tbar-item-nrml-mrgn;
-        padding-right: $tbar-item-nrml-mrgn;
-        padding-top: 0;
-
-        @if $skin-name != 'material'  {
-          margin-left: -1px;
-        }
-
-      }
-
-      .e-toolbar-extended.e-popup-close {
-        display: none;
-      }
-
-      .e-toolbar-extended.e-popup-open {
-        display: inline;
-      }
-
-      .e-toolbar-pop.e-toolbar-extended {
-        width: inherit;
-      }
-
-      .e-toolbar-extended {
-        box-shadow: none;
-        display: inline;
-        white-space: normal;
-
-        .e-toolbar-item:not(.e-separator) {
-
-          @if $skin-name == 'fabric' or $skin-name == 'highcontrast' {
-            margin: $tbar-item-nrml-padding-small;
-          }
-
-          height: 100%;
-          min-width: $tbar-item-nrml-minwidth;
-          padding: $tbar-item-nrml-padding;
-        }
-
-        .e-toolbar-item.e-separator.e-extended-separator {
-          display: none;
-        }
-
-        .e-toolbar-item.e-separator {
-          display: inline-flex;
-        }
-
-        .e-toolbar-item {
-          align-content: center;
-          align-items: center;
-          cursor: pointer;
-          display: inline-flex;
-          min-height: $tbar-nrml-item-size;
-          vertical-align: middle;
-          width: auto;
-
-          .e-tbar-btn.e-btn .e-tbar-btn-text,
-          .e-tbar-btn.e-btn.e-control .e-tbar-btn-text {
-            padding: $btn-txt-nrml-padding;
-          }
-
-          .e-tbar-btn-text {
-            display: inline-block;
-            font-family: $tbar-btn-family;
-            font-size: $tbar-btn-txt-font-size;
-            line-height: inherit;
-            vertical-align: middle;
-            width: auto;
-          }
-
-          .e-tbar-btn.e-btn,
-          .e-tbar-btn.e-btn.e-control {
-            height: $tbar-btn-nrml-height;
-            margin: $tbar-btn-nrml-mrgn;
-            min-height: $tbar-btn-nrml-minheight;
-            min-width: $tbar-btn-nrml-minwidth;
-            padding: $tbar-btn-nrml-padding;
-          }
-
-          .e-tbar-btn.e-btn {
-            line-height: $tbar-btn-nrml-line-height;
-
-            @if $skin-name == 'bootstrap' {
-
-              &:focus {
-                padding: 0 1.5px;
-              }
-
-              &:hover {
-                padding: 0 1.5px;
-              }
-
-              &:active {
-                padding: 0 1.5px;
-              }
-
-            }
-
-          }
-
-        }
-
-        .e-toolbar-item.e-separator {
-          margin: $tbar-separator-nrml-mrgn;
-          min-height: $tbar-btn-icon-nrml-height;
-          min-width: 1px;
-          vertical-align: middle;
-        }
-
-        .e-toolbar-item .e-btn.e-tbar-btn .e-icons.e-btn-icon:not(.e-toolbar-pop) {
-          line-height: $tbar-btn-icon-nrml-line-height;
-          min-height: $tbar-btn-icon-nrml-height;
-          min-width: $tbar-btn-icon-nrml-width;
-          padding: 0;
-        }
+    .e-popup-down-icon.e-icons,
+    .e-popup-up-icon.e-icons {
+      color: $tbar-default-icon-color;
+      display: flex;
+      text-align: center;
+      vertical-align: middle;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      font-size: $tbar-popup-icon-font-size;
+    }
 
-      }
+    &.e-toolpop {
+      overflow: visible;
 
       .e-toolbar-items {
 
-        .e-toolbar-item.e-separator:last-of-type {
-          display: inline-flex;
-        }
-
-      }
-
-      .e-toolbar-pop.e-toolbar-extended {
-
-        .e-toolbar-item:not(.e-separator) {
-          height: auto;
-        }
-
         .e-toolbar-item {
 
-          .e-tbar-btn .e-icons.e-btn-icon {
-            font-size: 14px;
-            vertical-align: middle;
-          }
-
-          .e-tbar-btn {
-            cursor: pointer;
-            font-family: $tbar-btn-family;
-            font-size: $tbar-btn-font-size;
-            font-weight: $tbar-btn-weight;
-            overflow: hidden;
-            padding: $tbar-btn-nrml-padding;
-            text-align: center;
-            text-decoration: none;
-            text-transform: none;
+          &.e-popup-text .e-tbar-btn-text {
+            display: none;
           }
-
-        }
-
-        .e-tbar-btn:first-child {
-          display: inline-block;
         }
-
-        .e-toolbar-item  > * {
-          align-self: center;
-          text-overflow: ellipsis;
-        }
-
       }
-
-    }
-
-    &.e-control[class*='e-toolbar'] {
-      box-sizing: content-box;
-    }
-
-    &.e-toolpop {
-
-      .e-toolbar-items .e-toolbar-item {
-
-        &.e-popup-text .e-tbar-btn-text {
-          display:  none;
-     }
-
-    }
-   }
-
-    &,
-    .e-toolbar-items .e-toolbar-item {
-
-      .e-tbar-btn-text {
-        display: inline-block;
-        padding: $btn-txt-nrml-padding;
-     }
-
-      &.e-hidden {
-        display: none;
-     }
-    }
-
-    &.e-corner {
-      border-radius: $tbar-border-radius;
     }
 
     .e-toolbar-pop {
@@ -729,624 +687,239 @@
       padding: $tbar-popup-padding;
       position: absolute;
 
-
-      &.e-toolbar-extended {
-
-        .e-toolbar-item .e-tbar-btn.e-btn .e-icons.e-btn-icon {
-          margin: 0;
-          width: auto;
-        }
-
-      }
-
       .e-toolbar-item  {
+        display: flex;
+        height: $tbar-item-height;
+        justify-content: center;
+        min-height: $tbar-btn-pop-nrml-minheight;
 
         &.e-toolbar-popup.e-hidden {
           display: none;
         }
 
         .e-tbar-btn.e-btn {
-          display: inline-flex;
-          justify-content: flex-start;
           min-height: $tbar-btn-pop-nrml-minheight;
-          padding: $tbar-pop-btn-nrml-padding;
-          @if $skin-name == 'bootstrap' {
-            border: 0;
-            border-radius: 0;
-            margin: 0;
-          }
-
-          .e-icons.e-btn-icon {
-            margin: $tbar-zero-value;
-            padding: $tbar-pop-icon-nrml-padding;
-            width: auto;
-          }
-
-          .e-icon-left {
-            @if $skin-name == 'material' {
-              padding-right: 16px;
-            }
-          }
-
-          .e-tbar-btn-text {
-            padding: $tbar-pop-btn-txt-nrml-pad;
-          }
-        }
-
-        .e-tbar-btn .e-icons.e-btn-icon {
-          min-width: $tbar-btn-icon-nrml-width;
-        }
-
-        &:not(.e-separator) {
-          min-width: 34px;
-          padding: $tbar-item-pop-nrml-padding;
-        }
-
-        &.e-tbtn-align .e-btn.e-control {
-          text-align: center;
-
-          .e-icons.e-btn-icon {
-            min-width: 100%;
-          }
-      }
-      }
-
-      .e-toolbar-item {
-        align-content: center;
-        align-items: center;
-        display: flex;
-        height: auto;
-        justify-content: center;
-
-        @if $skin-name == 'material' {
-          height: 36px;
-        }
-
-        > * {
-          height: 100%;
           min-width: 100%;
-          text-overflow: ellipsis;
-        }
-      }
-
-      .e-toolbar-text .e-tbar-btn-text {
-        display: none;
-      }
-
-      .e-toolpopup {
-        text-align: center;
-       }
-
-      }
-
-    .e-toolbar-popup {
-      text-align: center;
-    }
-
-    &.e-toolpop.e-rtl {
-
-      .e-toolbar-items:not(.e-tbar-pos) {
-
-        .e-toolbar-center .e-toolbar-item {
-          margin: 0;
-          }
-
-        .e-toolbar-right .e-toolbar-item:last-child {
-          margin: 0;
-          margin-left: $tbar-item-nrml-mrgn;
-         }
-
-        .e-toolbar-right .e-toolbar-item {
-          margin: 0;
-         }
-      }
-    }
-
-    &.e-rtl {
-
-      .e-hscroll-bar .e-hscroll-content {
-
-        > .e-toolbar-item:last-child {
-          margin-left: $tbar-item-nrml-mrgn;
-          margin-right: initial;
-        }
-
-        .e-toolbar-center .e-toolbar-item {
-          margin: 0;
-        }
-
-        .e-toolbar-right .e-toolbar-item:last-child {
-          margin-right: $tbar-item-nrml-mrgn;
-        }
-
-        .e-toolbar-right .e-toolbar-item {
-          margin: 0;
-        }
-      }
-
-      .e-toolbar-items {
-
-        &.e-tbar-pos {
-
-          .e-toolbar-left {
-            left: auto;
-            right: 0;
-          }
-
-          .e-toolbar-right {
-            left: 0;
-            right: auto;
-          }
-        }
-
-        .e-toolbar-left {
-
-          .e-toolbar-item:first-child {
-            margin-left: 0;
-            }
-
-          .e-toolbar-item:last-child {
-            margin-left: $tbar-item-nrml-mrgn;
-            }
-        }
-
-        &:not(.e-tbar-pos) {
-
-          .e-toolbar-item:first-child {
-            margin-left: 0;
-            margin-right: $tbar-item-nrml-mrgn;
-          }
-        }
-
-        &:first-child {
-
-          .e-hscroll-bar:first-child {
-
-            .e-toolbar-left {
-
-              .e-toolbar-item:last-child {
-                margin-left: 0;
-              }
-
-              .e-toolbar-item:first-child {
-                margin-left: 0;
-                margin-right: $tbar-item-nrml-mrgn;
-              }
-            }
-
-            .e-toolbar-center {
-
-              .e-toolbar-item:last-child {
-                margin-right: 0;
-              }
-            }
-
-            .e-toolbar-right {
-
-              .e-toolbar-item {
-
-                &:last-child {
-                  margin-left: $tbar-item-nrml-mrgn;
-                  margin-right: 0;
-                }
-
-                &:first-child {
-                  margin-right: 0;
-                }
-              }
-            }
-
-            .e-toolbar-item:last-child {
-              margin-left: $tbar-item-nrml-mrgn;
-              margin-right: 0;
-            }
-          }
-
-          > .e-toolbar-item:last-child,
-          > .e-toolbar-right .e-toolbar-item {
-
-            &:last-child {
-              margin-right: 0;
-            }
-
-            &:first-child {
-              margin-right: $tbar-item-nrml-mrgn;
-            }
-          }
-        }
-      }
-
-      .e-toolbar-pop {
-
-        .e-toolbar-item .e-tbar-btn.e-btn .e-icon-left {
-          @if $skin-name == 'material' {
-            padding-left: 16px;
-            padding-right: 0;
-          }
-        }
-      }
-
-      .e-hor-nav {
-        left: $tbar-zero-value;
-        right: auto;
-        @if $skin-name == 'bootstrap' {
-          border-radius: $tbar-radius 0 0 $tbar-radius;
-        }
-      }
-    }
-
-    .e-hor-nav {
-      align-items: center;
-      border-radius: 0 $tbar-radius $tbar-radius 0 ;
-      cursor: pointer;
-      display: flex;
-      height: 100%;
-      min-height: $tbar-nrml-items-size;
-      overflow: hidden;
-      position: absolute;
-      right: $tbar-zero-value;
-      top: $tbar-zero-value;
-      width: $tbar-nav-nrml-width;
-
-      &.e-ie-align {
-        display: table;
-        }
-      }
-
-    .e-popup-down-icon.e-icons,
-    .e-popup-up-icon.e-icons {
-      display: table-cell;
-      text-align: center;
-      vertical-align: middle;
-      width: 100%;
-      }
-
-    .e-toolbar-item {
-
-      .e-tbar-btn.e-btn {
-        line-height: $tbar-btn-nrml-line-height;
-
-        .e-icons.e-btn-icon {
-          line-height: $tbar-btn-icon-nrml-line-height;
-          min-height: $tbar-btn-icon-nrml-height;
-        }
-      }
-    }
-
-    .e-toolbar-items {
-      border-radius:  $tbar-radius 0 0 $tbar-radius;
-      display: inline-block;
-      height: 100%;
-      min-height: $tbar-nrml-items-size;
-      vertical-align: middle;
-
-      &.e-toolbar-multirow {
-        margin-bottom: 1px;
-        margin-left: $tbar-multirow-items-mrgn-small;
-        margin-right: $tbar-multirow-items-mrgn-small;
-        white-space: normal;
-
-        .e-toolbar-item:not(.e-separator) {
-          @if $skin-name == 'fabric' or $skin-name == 'highcontrast' {
-            margin: $tbar-multirow-item-top-btm-mrgn-small;
-          }
-        }
-
-        .e-toolbar-item.e-separator.e-multirow-separator {
-          display: none;
-        }
-
-        .e-toolbar-item.e-separator {
-          display: inline-flex;
-        }
-
-      }
-
-      &.e-multirow-pos {
-
-        .e-toolbar-left,
-        .e-toolbar-center,
-        .e-toolbar-right {
-          display: inline;
-        }
-
-      }
-
-      &.e-toolbar-multirow:not(.e-tbar-pos) {
-
-        .e-toolbar-item:first-child {
-          margin-left: $tbar-multirow-item-mrgn;
-        }
-
-        .e-toolbar-item:last-child {
-          margin-right: $tbar-multirow-item-mrgn;
-        }
-
-      }
-
-      &.e-tbar-pos {
-        display: block;
-
-        .e-toolbar-left,
-        .e-toolbar-center,
-        .e-toolbar-right {
-          display: table;
-          height: 100%;
-          top: 0;
-       }
-
-        .e-toolbar-right,
-        .e-toolbar-left {
-          position: absolute;
-        }
-
-        .e-toolbar-right {
-          right: 0;
-        }
-
-        .e-toolbar-left {
-          left: 0;
-          line-height: $tbar-left-item-line-height;
-        }
-
-        .e-toolbar-center {
-          margin: 0 auto;
-        }
-      }
-
-      .e-toolbar-left,
-      .e-toolbar-center,
-      .e-toolbar-right {
-        display: inline-block;
-        }
-
-      .e-toolbar-left {
-
-        .e-toolbar-item:first-child {
-          margin-left: $tbar-item-nrml-mrgn;
-        }
-      }
-
-      &:not(.e-tbar-pos) {
-
-        .e-toolbar-item:first-child {
-          margin-left: $tbar-item-nrml-mrgn;
-        }
-
-        .e-toolbar-right {
-
-          .e-toolbar-item:first-child {
-            margin-left: 0;
-        }
-        }
-      }
-
-      &:first-child {
-
-        .e-hscroll-bar:first-child {
-
-          .e-toolbar-left {
-
-            .e-toolbar-item:last-child {
-              margin-right: 0;
-              }
-
-            .e-toolbar-item:first-child {
-              margin-left: $tbar-item-nrml-mrgn;
-              }
-          }
-
-          .e-toolbar-center {
-            .e-toolbar-item:last-child {
-              margin-right: 0;
-          }
-          }
-
-          .e-toolbar-right {
-
-            .e-toolbar-item {
-
-              &:last-child {
-                margin-right: $tbar-item-nrml-mrgn;
-              }
-
-              &:first-child {
-                margin-left: 0;
-              }
-            }
-          }
-
-          .e-toolbar-item:last-child {
-            margin-right: $tbar-item-nrml-mrgn;
-          }
-        }
-
-        > .e-toolbar-item:last-child,
-        > .e-toolbar-right .e-toolbar-item:last-child {
-          margin-right: $tbar-item-nrml-mrgn;
-     }
-    }
+          padding: $tbar-pop-btn-nrml-padding;
+          border: $tbar-popup-btn-border;
+          border-radius: $tbar-popup-btn-border-radius;
+          justify-content: flex-start;
 
-      .e-hscroll-bar .e-hscroll-content {
+          .e-icons.e-btn-icon {
+            margin: $tbar-zero-value;
+            padding: $tbar-pop-icon-nrml-padding;
+            width: auto;
+          }
 
-        > .e-toolbar-item:last-child {
-          margin-right: $tbar-item-nrml-mrgn;
+          .e-tbar-btn-text {
+            padding: $tbar-pop-btn-txt-nrml-pad;
+          }
         }
 
-        .e-toolbar-center .e-toolbar-item {
-          margin: 0;
+        &:not(.e-separator) {
+          min-width: 34px;
+          padding: $tbar-item-pop-nrml-padding;
         }
 
-        .e-toolbar-right .e-toolbar-item:last-child {
-          margin-right: $tbar-item-nrml-mrgn;
+        > * {
+          height: 100%;
+          min-width: 100%;
+          text-overflow: ellipsis;
         }
 
-        .e-toolbar-right .e-toolbar-item {
-          margin: 0;
+        &.e-tbtn-align .e-btn.e-control .e-icons.e-btn-icon {
+          min-width: 100%;
         }
       }
 
-      .e-toolbar-item  {
-        align-content: center;
-        align-items: center;
-        cursor: pointer;
-        display: inline-flex;
-        min-height: $tbar-nrml-item-size;
-        vertical-align: middle;
-        width: auto;
+      .e-toolbar-text .e-tbar-btn-text {
+        display: none;
+      }
 
-        &:not(.e-separator) {
-          height: 100%;
-          min-width: $tbar-item-nrml-minwidth;
-          padding: $tbar-item-nrml-padding;
-        }
+      .e-toolbar-popup,
+      .e-toolpopup {
+        text-align: center;
+      }
+    }
 
-        &.e-separator {
-          margin: $tbar-separator-nrml-mrgn;
-          min-height: $tbar-separator-nrml-minheight;
-          min-width: 1px;
-        }
+    &.e-extended-toolbar {
+      overflow: visible;
 
-        input[type='checkbox'] {
-          height: auto;
-        }
+      &.e-tbar-extended {
+        border-bottom: 0;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+      }
 
-        &.e-popup-text {
+      .e-toolbar-extended {
+        border-top: 0;
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+        min-height: $tbar-nrml-size;
+        padding-bottom: 0;
+        padding-left: $tbar-item-nrml-mrgn;
+        padding-right: $tbar-item-nrml-mrgn;
+        padding-top: 0;
+        margin-left: -1px;
+        box-shadow: none;
+        display: inline;
+        white-space: normal;
 
-          .e-tbar-btn.e-btn {
+        .e-toolbar-item {
+          display: inline-flex;
+          min-height: $tbar-nrml-item-size;
 
-            &.e-tbtn-txt {
+          .e-tbar-btn.e-btn,
+          .e-tbar-btn.e-btn.e-control {
+            min-height: $tbar-btn-nrml-minheight;
+            min-width: $tbar-btn-nrml-minwidth;
+            padding: $tbar-btn-nrml-padding;
 
-              .e-icons.e-btn-icon {
-                padding: $tbar-zero-value;
-             }
-          }
-          }
-        }
+            .e-tbar-btn-text {
+              padding: $btn-txt-nrml-padding;
+              font-size: $tbar-btn-txt-font-size;
+            }
 
-        .e-tbar-btn.e-btn {
-          height: $tbar-btn-nrml-height;
-          margin: $tbar-btn-nrml-mrgn;
-          min-height: $tbar-btn-nrml-minheight;
-          min-width: $tbar-btn-nrml-minwidth;
-          padding: $tbar-btn-nrml-padding;
+            .e-icons.e-btn-icon:not(.e-toolbar-pop) {
+              display: flex;
+              align-items: center;
+              vertical-align: middle;
+              justify-content: center;
+              padding: $tbar-ext-btn-icon-padding;
+              font-size: $tbar-ext-btn-icon-font-size;
+            }
 
-          @if $skin-name == 'bootstrap' {
-            line-height: 27px;
+            &.e-tbtn-txt {
 
-            &:focus {
-              padding: 0 1.5px;
-            }
+              .e-icons.e-btn-icon:not(.e-toolbar-pop) {
+                padding: $tbar-btn-icn-nrml-padding;
+              }
 
-            &:hover {
-              padding: 0 1.5px;
+              .e-icons.e-icon-right.e-btn-icon:not(.e-toolbar-pop) {
+                padding: $tbar-btn-icn-right-nrml-padding;
+              }
             }
 
+            &:hover,
+            &:focus,
             &:active {
-              padding: 0 1.5px;
+              padding: $tbar-ext-btn-focus-padding;
             }
           }
 
-          @if $skin-name == 'highcontrast' {
-            &:focus {
-              outline: none;
-            }
+          &:not(.e-separator) {
+            min-width: $tbar-item-nrml-minwidth;
+            padding: $tbar-item-nrml-padding;
           }
 
-          @if $skin-name == 'fabric' {
-            &:focus {
-              outline: none;
+          &.e-separator {
+            min-height: $tbar-btn-icon-nrml-height;
+
+            &.e-extended-separator {
+              display: none;
             }
           }
 
-          &.e-tbtn-txt {
+          &.e-toolbar-text .e-tbar-btn-text {
+            display: none;
+          }
+        }
 
-            .e-icons.e-btn-icon {
-              padding: $tbar-btn-icn-nrml-padding;
+        &.e-popup-close {
+          display: none;
+        }
+  
+        &.e-popup-open {
+          display: inline;
+        }
+
+        &.e-toolbar-pop {
+          width: inherit;
+
+          .e-toolbar-item {
+  
+            .e-tbar-btn {
+              cursor: pointer;
+              font-size: $tbar-btn-font-size;
+              overflow: hidden;
+              padding: $tbar-btn-nrml-padding;
+
+              .e-icons.e-btn-icon {
+                font-size: 14px;
+              }
             }
 
-            .e-icons.e-icon-right.e-btn-icon {
-              padding: $tbar-btn-icn-right-nrml-padding;
+            &:not(.e-separator) {
+              height: auto;
             }
           }
 
-          .e-icons.e-btn-icon {
-            margin: $tbar-zero-value;
-            min-width: $tbar-btn-icon-nrml-width;
-            width: auto;
+          .e-toolbar-item > * {
+            align-self: center;
+            text-overflow: ellipsis;
           }
-         }
-
-        > * {
-          align-self: center;
-          text-overflow: ellipsis;
         }
+      }
 
-        &.e-separator {
-          height: $tbar-separator-nrml-height;
-          vertical-align: middle;
+      .e-toolbar-items {
 
-          + .e-separator {
-            display: none;
-          }
+        .e-toolbar-item {
 
-          &:last-of-type,
-          &:first-of-type {
+          &.e-popup-text .e-tbar-btn-text {
             display: none;
-         }
+          }
+  
+          &.e-separator:last-of-type {
+            display: inline-flex;
           }
         }
-    }
+      }
 
-    .e-tbar-btn  > :first-child {
-      display: inline-block;
+      .e-hor-nav.e-ie-align {
+        display: table;
       }
+    }
 
-    .e-tbar-btn {
-      border: $header-gradient-color;
-      cursor: pointer;
-      font-family: $tbar-btn-family;
-      font-size: $tbar-btn-font-size;
-      font-weight: $tbar-btn-weight;
-      overflow: hidden;
-      padding: $tbar-btn-nrml-padding;
-      text-align: center;
-      text-decoration: none;
-      text-transform: none;
+    &.e-rtl {
 
-      .e-icons.e-btn-icon {
-        font-size: $tbar-btn-font-size;
-        vertical-align: middle;
-      }
+      .e-toolbar-item {
 
-      div {
-        vertical-align: middle;
-      }
+        .e-tbar-btn {
 
-      .e-tbar-btn-text {
-        display: inline-block;
-        font-family: $tbar-btn-family;
-        font-size: $tbar-btn-txt-font-size;
-        line-height: inherit;
-        vertical-align: middle;
-        width: auto;
-       }
-    }
+          &.e-tbtn-txt {
 
-    &.e-vertical {
-      display: flex;
-      flex-direction: column;
+            .e-icons.e-btn-icon {
+              padding: $tbar-rtl-btn-icn-nrml-padding;
 
-      &.e-rtl.e-tbar-pos {
+              &.e-icon-right {
+                padding: $tbar-rtl-btn-icn-right-nrml-padding;
+              }
+            }
+          }
 
-        .e-toolbar-left {
-          bottom: 0;
-          top: auto;
+          .e-tbar-btn-text {
+            padding: $btn-rtl-txt-nrml-padding;
+          }
         }
+      }
 
-        .e-toolbar-right {
-          bottom: auto;
-          top: 0;
+      .e-hscroll-bar .e-hscroll-content {
+
+        > .e-toolbar-item:last-child {
+          margin-left: $tbar-item-nrml-mrgn;
+          margin-right: initial;
+        }
+
+        .e-toolbar-center .e-toolbar-item {
+          margin: 0;
+        }
+
+        .e-toolbar-right .e-toolbar-item {
+          margin: 0;
+
+          &:last-child {
+            margin-right: $tbar-item-nrml-mrgn;
+          }
         }
       }
 
@@ -1354,65 +927,95 @@
 
         &.e-tbar-pos {
 
-          .e-toolbar-left,
-          .e-toolbar-center,
-          .e-toolbar-right {
-            height: auto;
-          }
-
           .e-toolbar-left {
             left: auto;
-            right: auto;
-            top: 0;
+            right: 0;
           }
 
           .e-toolbar-right {
-            bottom: 0;
-            left: auto;
+            left: 0;
             right: auto;
           }
         }
 
-        &:not(.e-tbar-pos) .e-toolbar-item {
+        .e-toolbar-left {
 
-          &:first-child {
-            margin-left: 0;
-          }
+          .e-toolbar-item {
 
-          &:last-child {
-            margin-right: 0;
+            &:first-child {
+              margin-left: 0;
+            }
+
+            &:last-child {
+              margin-left: $tbar-item-nrml-mrgn;
+            }
           }
         }
 
-        .e-toolbar-item {
-          display: flex;
-          height: auto;
+        &:not(.e-tbar-pos) {
 
-          &:not(.e-separator) {
-            min-width: 33px;
+          .e-toolbar-item:first-child {
+            margin-left: 0;
+            margin-right: $tbar-item-nrml-mrgn;
           }
+        }
 
-          &.e-separator {
-            height: auto;
-            margin: $tbar-separator-vertical-nrml-mrgn;
-            min-height: auto;
+        &:first-child {
+
+          > .e-toolbar-item:last-child,
+          > .e-toolbar-right .e-toolbar-item {
+
+            &:last-child {
+              margin-right: 0;
+            }
+
+            &:first-child {
+              margin-right: $tbar-item-nrml-mrgn;
+            }
           }
+        }
+      }
+
+      .e-hor-nav {
+        left: $tbar-zero-value;
+        right: auto;
+        border-radius: $tbar-radius 0 0 $tbar-radius;
+      }
+    }
+
+    &.e-toolpop.e-rtl {
+
+      .e-toolbar-items:not(.e-tbar-pos) {
+
+        .e-toolbar-center .e-toolbar-item {
+          margin: 0;
+        }
+
+        .e-toolbar-right .e-toolbar-item {
+          margin: 0;
 
-          .e-tbar-btn.e-btn {
-            margin: $tbar-v-btn-nrml-mrgn;
+          &:last-child {
+            margin: 0;
+            margin-left: $tbar-item-nrml-mrgn;
           }
         }
       }
+    }
+
+    &.e-extended-toolbar.e-rtl {
 
       .e-hor-nav {
-        bottom: 0;
-        height: auto;
         left: 0;
-        min-height: 40px;
-        min-width: 50px;
         right: auto;
-        top: auto;
-        width: auto;
+      }
+
+      .e-toolbar-extended {
+        padding-right: $tbar-item-nrml-mrgn;
+        margin-left: 0;
+
+        .e-toolbar-item .e-tbar-btn.e-btn .e-icon-left {
+          padding-left: 0;
+        }
       }
     }
   }