ru.coon 2.8.34 → 2.8.36

package/CHANGELOG.md

@@ -1,5 +1,22 @@
+# Version 2.8.36, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ac608fdca962cfa8af527838d308dcfd40f85f39)
+* ## Fixes
+* <span style='color:red'>fix edit user roles</span> ([23141a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/23141ac0b09283e97e0f7351f45feac800e5276a))
+
+* update: CHANGELOG.md ([837174], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8371747b3411f33cbc38fe2399e50037732ff60d))
+
+# Version 2.8.35, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/36f6eeedb3ad71d1e54b83364c2634e7459b767f)
+* update: CHANGELOG.md ([e6af30], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e6af309d269470ca9e41ca1d52116ff7b87de9f0))
+
+# Version 2.8.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8aff2ff7529f0b21fb3151ae53f2409c16840bc2)
+* ## Fixes
+* <span style='color:red'> edit user roles</span> ([939a2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/939a2d6bb50daddd8ed265c04f9e355e53c37098))
+
+* Revert "Merge branch 'TR-69858' into 'develop'" ([f03f50], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f03f5087de3f78048cfa554985fe342ebfcb2792))
+* update: CHANGELOG.md ([a4a1e9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a4a1e9873b0dbaf25ab17d854eb3bfee81924d0f))
+
 # Version 2.8.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/74999de9bdff9c55e4f0b1d8840558559f532fa8)
 * ## Features
+* <span style='color:green'>feat: HT-10938: work with mixed row selection model</span> ([734f87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/734f8738a52b2126c7dcc42cfc458d4fc7eeca2f))
 * <span style='color:green'>feat: HT-11121: create report filter form component</span> ([ab1494], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ab1494918f8f42640c7b577e407fbde080de55f5))
 
 * ## Fixes
@@ -98,6 +115,7 @@ remove unusual alternateClassName</span> ([7427bf], [link](http://gitlab-dbr.sig
 * <span style='color:green'>feat: HT-10270 CoonChart new chartType and refactoring</span> ([055785], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/05578581ee41bb993ed48efbc9072d0fd11b69b5))
 * <span style='color:green'>feat: HT-10270 CoonChart new chartType and refactoring</span> ([dd953a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dd953a4782945ddfb6516fe8866bc9d6ee9d3370))
 * <span style='color:green'>feat: HT-10270 CoonChart new chartType and refactoring</span> ([81da35], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/81da35474745b812fcf89c4b569870ed72a4c66e))
+* <span style='color:green'>feat: TR-69858 рефакторинг компонента UiCustomPanelPluginSelectWindow и связанных с ним</span> ([374412], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/37441261d05a428c66152e36938b37dd52dbb79d))
 
 * upd ([571495], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/571495ffbd6b23c76edd9eac741b87163fc59cdc))
 * add loadFakeData to ReportPanel ([671b7f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/671b7f27f3538291a56ba8c1b45016910b42e17d))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.8.34",
+  "version": "2.8.36",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/sass/src/all.scss

@@ -1 +0,0 @@
-@import './component/Button.scss';

package/src/report/plugin/grid/GridRowCountPlugin.js

@@ -20,9 +20,10 @@ Ext.define('Coon.report.plugin.grid.GridRowCountPlugin', {
         this.component.getStore().on('load', this.recalculate, this);
         this.component.getStore().on('datachanged', this.recalculate, this);
         this.component.getStore().on('remove', this.recalculate, this);
-        if (this.isCalculateSelected(this.component.getSelectionModel())) {
+        if (this.isCalculateSelected(this.component.getSelectionModel()) || this.component.getSelectionModel().type === 'mixedRowModel') {
             this.component.getSelectionModel().on('selectionchange', this.recalculate, this);
         }
+        this.component.getSelectionModel().on('mixedrowselectionchange', this.recalculate, this);
     },
 
     createToolbarItem: function(config) {
@@ -42,11 +43,14 @@ Ext.define('Coon.report.plugin.grid.GridRowCountPlugin', {
         let count = '';
         const selectionModel = this.component.getSelectionModel();
         const isCalculateSelected = this.isCalculateSelected(selectionModel);
+        if (selectionModel.type === 'mixedRowModel') {
+            count += selectionModel.getSelection().length + '/';
+            count += this.component.getStore().getCount();
+            return `${this.withSelectionTitle}: <span style="font-weight: bold;">${count}</span>`;
+        }
         if (isCalculateSelected) {
             count += selectionModel.getSelection().length + '/';
         }
-        count += this.component.getStore().getCount();
-
         return (isCalculateSelected ? this.withSelectionTitle : this.totalTitle) +
             ': <span style="font-weight: bold;">' + count + '</span>';
     },

package/src/report/selectionModels/MixedRowSelectionModel.js

@@ -125,6 +125,7 @@ Ext.define('Ext.selection.MixedRowSelectionModel', {
                 }
             }
         }
+        this.fireEvent('mixedrowselectionchange');
     },
     refreshView() {
         const views = this.views || [this.view];

package/src/security/securitySettingComponent/RoleEditPanelController.js

@@ -30,9 +30,8 @@ Ext.define('Coon.security.securitySettingComponent.RoleEditPanelController', {
 
     getGitData() {
         this.view.mask('Загрузка');
-        const params = new URLSearchParams();
         const pathsArray = Object.values(this.paths);
-        pathsArray.forEach((path) => params.append('paths', path));
+        const params = {paths: pathsArray};
         return new Promise((resolve, reject) => {
             Coon.Function.doRequest(null, {
                 url: 'git/opa/downloadBulk',
@@ -50,7 +49,7 @@ Ext.define('Coon.security.securitySettingComponent.RoleEditPanelController', {
         if (data) {
             const gitData = JSON.parse(data);
             const parseData = (path) => {
-                return JSON.parse(gitData.find((el) => el.path === this.paths(path)).content || '{}');
+                return JSON.parse(gitData.find((el) => el.path === this.paths[path]).content || '{}');
             };
             this.menuGitDataContent = parseData('menuByRole');
             this.reportGitDataContent = parseData('reportPlugin');

package/src/security/securitySettingComponent/uiCP/RoleEditUiCPController.js

@@ -138,7 +138,7 @@ Ext.define('Coon.security.securitySettingComponent.uiCP.RoleEditUiCPController',
                 delete this.uiCpGitDataContent[masterUiElement];
             }
         }
-        this.lookup('UICPButtonsGrid').getStore().remove(selectedUICPButtonRecord);
+        // this.lookup('UICPButtonsGrid').getStore().remove(selectedUICPButtonRecord);
     },
 
 });

package/src/security/securitySettingComponent/url/RoleEditUrlController.js

@@ -11,6 +11,9 @@ Ext.define('Coon.security.securitySettingComponent.url.RoleEditUrlController', {
             return;
         }
         this.urlGitDataContent = data;
+        if (!this.urlGitDataContent[this.role]) {
+            return;
+        }
         this.getView().getStore().loadData(this.urlGitDataContent[this.role]);
     },
 

package/src/security/securitySettingComponent/user/RoleEditUserController.js

@@ -54,9 +54,12 @@ Ext.define('Coon.security.securitySettingComponent.user.RoleEditUserController',
     deleteUserNameRecordHandler() {
         const selectedUserRecord = this.getView().getSelection()[0];
         const userName = selectedUserRecord.get('userName');
+        if (!this.userRoleGitDataContent[userName]) {
+            return;
+        }
         const index = this.userRoleGitDataContent[userName].findIndex((el) => el === this.role);
         index !== -1 && this.userRoleGitDataContent[userName].splice(index, 1);
-        this.getView().getStore().remove(selectedUserRecord);
+        // this.getView().getStore().remove(selectedUserRecord);
     },
 
     getUserRoleGitDataContent() {

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.8.34',
+    number: '2.8.36',
 });

package/sass/src/component/Button.scss

@@ -1,699 +0,0 @@
-@mixin button-negativity {
-}
-
-@mixin sigma-button-small-ui(
-  $ui,
-  $border-radius: $button-small-border-radius,
-  $border-width: $button-small-border-width,
-  $iconColor: null,
-
-  $border-color: null,
-  $border-color-over: null,
-  $border-color-focus: null,
-  $border-color-pressed: null,
-  $border-color-focus-over: null,
-  $border-color-focus-pressed: null,
-  $border-color-disabled: null,
-
-  $padding: $button-small-padding,
-  $text-padding: $button-small-text-padding,
-  $text-transform: "uppercase",
-
-  $background-color: null,
-  $background-color-over: null,
-  $background-color-focus: null,
-  $background-color-pressed: null,
-  $background-color-focus-over: null,
-  $background-color-focus-pressed: null,
-  $background-color-disabled: null,
-
-  $background-gradient: $button-default-background-gradient,
-  $background-gradient-over: $button-default-background-gradient-over,
-  $background-gradient-focus: $button-default-background-gradient-focus,
-  $background-gradient-pressed: $button-default-background-gradient-pressed,
-  $background-gradient-focus-over: $button-default-background-gradient-focus-over,
-  $background-gradient-focus-pressed: $button-default-background-gradient-focus-pressed,
-  $background-gradient-disabled: $button-default-background-gradient-disabled,
-
-  $color: null,
-  $color-over: null,
-  $color-focus: null,
-  $color-pressed: null,
-  $color-focus-over: null,
-  $color-focus-pressed: null,
-  $color-disabled: null,
-
-  $inner-border-width: null,
-  $inner-border-width-over: null,
-  $inner-border-width-focus: null,
-  $inner-border-width-pressed: null,
-  $inner-border-width-focus-over: null,
-  $inner-border-width-focus-pressed: null,
-  $inner-border-width-disabled: null,
-
-  $inner-border-color: null,
-  $inner-border-color-over: null,
-  $inner-border-color-focus: null,
-  $inner-border-color-pressed: null,
-  $inner-border-color-focus-over: null,
-  $inner-border-color-focus-pressed: null,
-  $inner-border-color-disabled: null,
-
-  $body-outline-width-focus: $button-default-body-outline-width-focus,
-  $body-outline-style-focus: $button-default-body-outline-style-focus,
-  $body-outline-color-focus: $button-default-body-outline-color-focus,
-
-  $font-size: null,
-  $font-size-over: null,
-  $font-size-focus: null,
-  $font-size-pressed: null,
-  $font-size-focus-over: null,
-  $font-size-focus-pressed: null,
-  $font-size-disabled: null,
-
-  $font-weight: null,
-  $font-weight-over: null,
-  $font-weight-focus: null,
-  $font-weight-pressed: null,
-  $font-weight-focus-over: null,
-  $font-weight-focus-pressed: null,
-  $font-weight-disabled: null,
-
-  $font-family: null,
-  $font-family-over: null,
-  $font-family-focus: null,
-  $font-family-pressed: null,
-  $font-family-focus-over: null,
-  $font-family-focus-pressed: null,
-  $font-family-disabled: null,
-
-  $line-height: $button-small-line-height,
-  $icon-size: $button-small-icon-size,
-  $glyph-font-size: $button-small-glyph-font-size,
-  $icon-spacing: $button-small-icon-spacing,
-  $glyph-color: $button-default-glyph-color,
-  $glyph-opacity: $button-default-glyph-opacity,
-  $arrow-width: $button-small-arrow-width,
-  $arrow-height: $button-small-arrow-height,
-  $arrow-glyph: $button-small-arrow-glyph,
-  $arrow-glyph-color: $button-default-arrow-glyph-color,
-  $split-width: $button-small-split-width,
-  $split-height: $button-small-split-height,
-  $split-line-width: $button-small-split-line-width,
-  $split-line-color: $button-default-split-line-color,
-  $include-ui-menu-arrows: $button-include-ui-menu-arrows,
-  $include-ui-split-arrows: $button-include-ui-split-arrows,
-  $include-split-noline-arrows: $button-include-split-noline-arrows,
-  $include-split-over-arrows: $button-include-split-over-arrows,
-  $opacity-disabled: $button-opacity-disabled,
-  $inner-opacity-disabled: $button-inner-opacity-disabled,
-
-  $button-hovered-color: null,
-  $box-shadow: null,
-  $letter-spacing: null
-) {
-  @if $color ==null {
-    $color: white;
-  }
-
-  @if $font-size ==null {
-    $font-size: small;
-  }
-
-  @if $font-weight ==null {
-    $font-weight: normal;
-  }
-
-  .#{$prefix}segmented-button {
-    border: 1px solid $secondary-border-color-text;
-    border-radius: 6px;
-    overflow: hidden;
-
-    .x-segmented-button-item {
-      padding: 6px 8px;
-      background-color: $secondary-background-color;
-
-      .x-btn-inner {
-        color: $secondary-color-text;
-      }
-
-      &.x-btn-over {
-        background-color: inherit;
-
-        .x-btn-inner {
-          color: inherit;
-        }
-      }
-
-      &.x-btn-pressed {
-        background-color: $secondary-background-color-pressed;
-
-        .x-btn-inner {
-          color: $secondary-color-text-pressed;
-        }
-      }
-    }
-
-    & > *:not(:last-child) {
-      border-right: 1px solid $secondary-border-color-text;
-    }
-  }
-
-  .#{$prefix}btn-#{$ui}-small {
-
-
-    @if $ui =='primary' {
-      & {
-        box-shadow: 0px 1px 4px $primary-box-shadow-color;
-      }
-
-      &.x-btn-over {
-        box-shadow: 0px 2px 7px $primary-box-shadow-color-hover;
-      }
-
-      &.x-btn-pressed {
-        box-shadow: 0px 6px 9px $primary-box-shadow-color-active;
-      }
-      &.x-btn-disabled {
-        box-shadow: none;
-      }
-    }
-
-    @if $ui =='primary-with-icon' {
-      & {
-        gap: 8px;
-        box-shadow: 0px 1px 4px $primary-with-icon-box-shadow-color;
-      }
-
-      &.x-btn-over {
-        box-shadow: 0px 2px 7px $primary-box-shadow-color-hover;
-      }
-
-      &.x-btn-pressed {
-        box-shadow: 0px 6px 9px $primary-box-shadow-color-active;
-      }
-
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        .x-fa {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .x-fas {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .x-far {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .fa {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .svg-icon & {
-          background-color: $primary-icon-color;
-        }
-      }
-
-      .svg-icon.#{$prefix}btn-icon-el-#{$ui}-small {
-        background-color: $primary-icon-color;
-      }
-
-      &.x-btn-disabled {
-        .x-fa {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-fas {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-far {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .fa {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .svg-icon {
-          background-color: $primary-icon-color-disabled;
-        }
-      }
-    }
-
-    @if $ui =='primary-only-icon' {
-      & {
-        width: 36px;
-        box-shadow: 0px 1px 4px $primary-only-icon-box-shadow-color-active;
-      }
-
-      &.x-btn-over {
-        box-shadow: 0px 2px 7px $primary-box-shadow-color-hover;
-      }
-
-      &.x-btn-pressed {
-        box-shadow: 0px 6px 9px $primary-box-shadow-color-active;
-      }
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        .x-fa {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .x-fas {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .x-far {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-
-        .fa {
-          background-color: transparent;
-          color: $primary-icon-color;
-        }
-      }
-      .svg-icon.#{$prefix}btn-icon-el-#{$ui}-small {
-        background-color: $primary-icon-color;
-      }
-      &.x-btn-disabled {
-        .x-fa {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-fas {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-far {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .fa {
-          color: $primary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .svg-icon {
-          background-color: $primary-icon-color-disabled;
-        }
-      }
-    }
-
-
-    @if $ui =='secondary-with-icon' {
-
-      & {
-        gap: 8px;
-      }
-
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        .x-fa {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .x-fas {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .x-far {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .fa {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .svg-icon {
-          background-color: $secondary-icon-color;
-        }
-      }
-
-      &.x-btn-disabled {
-        .x-fa {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-fas {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-far {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .fa {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .svg-icon {
-          background-color: $secondary-icon-color-disabled;
-        }
-      }
-    }
-
-    @if $ui =='secondary-only-icon' {
-
-      & {
-        width: 36px;
-      }
-
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        .x-fa {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .x-fas {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .x-far {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .fa {
-          background-color: transparent;
-          color: $secondary-icon-color;
-        }
-
-        .svg-icon {
-          background-color: $secondary-icon-color;
-        }
-      }
-
-      &.x-btn-disabled {
-        .x-fa {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-fas {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-far {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .fa {
-          color: $secondary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .svg-icon {
-          background-color: $secondary-icon-color-disabled;
-        }
-      }
-    }
-
-
-    @if $ui =='tertiary-with-icon' {
-      & {
-        gap: 8px;
-      }
-
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        .x-fa {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .x-fas {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .x-far {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .fa {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .svg-icon {
-          background-color: $tertiary-icon-color;
-        }
-      }
-
-      &.x-btn-disabled {
-        .x-fa {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-fas {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-far {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .fa {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .svg-icon {
-          background-color: $tertiary-icon-color-disabled;
-        }
-      }
-    }
-
-    @if $ui == "tertiary-only-icon" {
-      & {
-        width: 36px;
-      }
-
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        .x-fa {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .x-fas {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .x-far {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .fa {
-          background-color: transparent;
-          color: $tertiary-icon-color;
-        }
-
-        .svg-icon {
-          background-color: $tertiary-icon-color;
-        }
-      }
-
-      &.x-btn-disabled {
-        .x-fa {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-fas {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .x-far {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .fa {
-          color: $tertiary-icon-color-disabled;
-          background-color: transparent;
-        }
-
-        .svg-icon {
-          background-color: $tertiary-icon-color-disabled;
-        }
-      }
-    }
-
-    @if $iconColor !=null {
-      .#{$prefix}btn-icon-el-#{$ui}-small {
-        color: $iconColor;
-      }
-    }
-
-    transition: transform 0.1s;
-
-    &:hover,
-    &:active {
-      transition: background 1.5s;
-    }
-
-    $buttons: "primary", "secondary", "tertiary", "primary-with-icon", "secondary-with-icon", "tertiary-with-icon",
-    "primary-only-icon", "secondary-only-icon", "tertiary-only-icon", "error", "success", "outline-success",
-    "outline-error";
-
-    @each $button in $buttons {
-      @if $ui == $button {
-        .#{$prefix}btn-inner-#{$ui}-small {
-          height: 20px;
-          $font-family: "Roboto";
-          font-style: normal;
-          $font-weight: 500;
-          $font-size: 14px;
-          line-height: 20px;
-          letter-spacing: 1px;
-        }
-        .#{$prefix}btn-inner-#{$ui}-small::first-letter {
-          text-transform: uppercase;
-        }
-        & {
-          display: inline-block;
-          $padding: 8px 16px;
-          gap: 10px;
-          min-width: 36px;
-          height: 36px;
-          $border-radius: 6px;
-        }
-        .svg-icon {
-          min-width: 16px !important;
-          min-height: 16px !important;
-          box-sizing: border-box;
-        }
-        .fa {
-          min-width: 16px !important;
-          min-height: 16px !important;
-          box-sizing: border-box;
-        }
-      }
-    }
-  }
-
-  @include extjs-button-small-ui(
-                  $ui,
-          $border-radius: $border-radius,
-          $border-width: $border-width,
-          $border-color: $border-color,
-          $border-color-over: $border-color-over,
-          $border-color-focus: $border-color-focus,
-          $border-color-pressed: $border-color-pressed,
-          $border-color-focus-over: $border-color-focus-over,
-          $border-color-focus-pressed: $border-color-focus-pressed,
-          $border-color-disabled: $border-color-disabled,
-          $padding: $padding,
-          $text-padding: $text-padding,
-          $background-color: $background-color,
-          $background-color-over: $background-color-over,
-          $background-color-focus: $background-color-focus,
-          $background-color-pressed: $background-color-pressed,
-          $background-color-focus-over: $background-color-focus-over,
-          $background-color-focus-pressed: $background-color-focus-pressed,
-          $background-color-disabled: $background-color-disabled,
-          $background-gradient: $background-gradient,
-          $background-gradient-over: $background-gradient-over,
-          $background-gradient-focus: $background-gradient-focus,
-          $background-gradient-pressed: $background-gradient-pressed,
-          $background-gradient-focus-over: $background-gradient-focus-over,
-          $background-gradient-focus-pressed: $background-gradient-focus-pressed,
-          $background-gradient-disabled: $background-gradient-disabled,
-          $color: $color,
-          $color-over: $color-over,
-          $color-focus: $color-focus,
-          $color-pressed: $color-pressed,
-          $color-focus-over: $color-focus-over,
-          $color-focus-pressed: $color-focus-pressed,
-          $color-disabled: $color-disabled,
-          $inner-border-width: $inner-border-width,
-          $inner-border-width-over: $inner-border-width-over,
-          $inner-border-width-focus: $inner-border-width-focus,
-          $inner-border-width-pressed: $inner-border-width-pressed,
-          $inner-border-width-focus-over: $inner-border-width-focus-over,
-          $inner-border-width-focus-pressed: $inner-border-width-focus-pressed,
-          $inner-border-width-disabled: $inner-border-width-disabled,
-          $inner-border-color: $inner-border-color,
-          $inner-border-color-over: $inner-border-color-over,
-          $inner-border-color-focus: $inner-border-color-focus,
-          $inner-border-color-pressed: $inner-border-color-pressed,
-          $inner-border-color-focus-over: $inner-border-color-focus-over,
-          $inner-border-color-focus-pressed: $inner-border-color-focus-pressed,
-          $inner-border-color-disabled: $inner-border-color-disabled,
-          $body-outline-width-focus: $body-outline-width-focus,
-          $body-outline-style-focus: $body-outline-style-focus,
-          $body-outline-color-focus: $body-outline-color-focus,
-          $font-size: $font-size,
-          $font-size-over: $font-size-over,
-          $font-size-focus: $font-size-focus,
-          $font-size-pressed: $font-size-pressed,
-          $font-size-focus-over: $font-size-focus-over,
-          $font-size-focus-pressed: $font-size-focus-pressed,
-          $font-size-disabled: $font-size-disabled,
-          $font-weight: $font-weight,
-          $font-weight-over: $font-weight-over,
-          $font-weight-focus: $font-weight-focus,
-          $font-weight-pressed: $font-weight-pressed,
-          $font-weight-focus-over: $font-weight-focus-over,
-          $font-weight-focus-pressed: $font-weight-focus-pressed,
-          $font-weight-disabled: $font-weight-disabled,
-          $font-family: $font-family,
-          $font-family-over: $font-family-over,
-          $font-family-focus: $font-family-focus,
-          $font-family-pressed: $font-family-pressed,
-          $font-family-focus-over: $font-family-focus-over,
-          $font-family-focus-pressed: $font-family-focus-pressed,
-          $font-family-disabled: $font-family-disabled,
-          $line-height: $line-height,
-          $icon-size: $icon-size,
-          $glyph-font-size: $glyph-font-size,
-          $icon-spacing: $icon-spacing,
-          $glyph-color: $glyph-color,
-          $glyph-opacity: $glyph-opacity,
-          $arrow-width: $arrow-width,
-          $arrow-height: $arrow-height,
-          $arrow-glyph: $arrow-glyph,
-          $arrow-glyph-color: $arrow-glyph-color,
-          $split-width: $split-width,
-          $split-height: $split-height,
-          $split-line-width: $split-line-width,
-          $split-line-color: $split-line-color,
-          $include-ui-menu-arrows: $include-ui-menu-arrows,
-          $include-ui-split-arrows: $include-ui-split-arrows,
-          $include-split-noline-arrows: $include-split-noline-arrows,
-          $include-split-over-arrows: $include-split-over-arrows,
-          $opacity-disabled: $opacity-disabled,
-          $inner-opacity-disabled: $inner-opacity-disabled
-  );
-}