From b354b8ede10707614cbb2b98ae3ccdee7b70fe45 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 26 May 2020 20:18:21 +0300 Subject: [PATCH] [DE] Update bootstrap (fix styles) --- apps/common/main/lib/component/MenuItem.js | 4 ++- apps/common/main/resources/less/buttons.less | 4 +++ .../main/resources/less/combo-dataview.less | 2 +- apps/common/main/resources/less/combobox.less | 4 +-- .../main/resources/less/dropdown-menu.less | 6 ++++ apps/common/main/resources/less/header.less | 1 + .../common/main/resources/less/variables.less | 2 ++ .../main/resources/less/app.less | 33 ++++++++++--------- 8 files changed, 36 insertions(+), 20 deletions(-) diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js index 6d710cbec..693423c61 100644 --- a/apps/common/main/lib/component/MenuItem.js +++ b/apps/common/main/lib/component/MenuItem.js @@ -152,7 +152,7 @@ define([ me.trigger('render:before', me); if (me.caption === '--') { - el.addClass('divider'); + el.addClass('dropdown-divider'); } else { if (!this.rendered) { el.off('click'); @@ -179,6 +179,8 @@ define([ ); } + el.addClass('dropdown-item'); + var firstChild = el.children(':first'); if (this.checkable && firstChild) { diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 160ccb572..59556e4c1 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -5,6 +5,7 @@ .btn { border-radius: 1px; color: @gray-deep; + padding: 1px 3px; .btnsize(@value) { min-width: @value; @@ -51,9 +52,11 @@ } .caret { + display: inline-block; width: 7px; height: 7px; border: 0; + vertical-align: middle; background-position: @arrow-small-offset-x @arrow-small-offset-y; position: relative; } @@ -412,6 +415,7 @@ + .dropdown-toggle { padding: 0 2px; } + flex: none; } > .dropdown-toggle:first-child { diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 8a144df1e..77f92aaae 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -73,7 +73,7 @@ margin-right: -@combo-dataview-button-width; padding-right: @combo-dataview-button-width; - //.border-left-radius(0); bootstrap error + #border-left-radius(0); .dataview { height: 46px; diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index e6f7df26d..1428b4ff5 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -1,8 +1,8 @@ .combobox { display: block; - //&.input-group-sm .btn { .input-sm(); } bootstrap error - //&.input-group-lg .btn { .input-lg(); } bootstrap error + &.input-group-sm .btn { .form-control-sm(); } + &.input-group-lg .btn { .form-control-lg(); } &.input-group-nr > .form-control, &.input-group-nr > .btn { height: @input-height-base; diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 557526847..81279fb31 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -3,6 +3,8 @@ } .dropdown-menu { + padding: 5px 0; + &.scrollable-menu { height: auto; max-height: 400px; @@ -26,7 +28,11 @@ } li { + &.dropdown-item { + padding: 0; + } & > a { + display: block; padding: 5px 20px; cursor: pointer; diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index d22c88966..959784dbe 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -374,6 +374,7 @@ } #title-doc-name { + color: @white; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 044f6cbc4..52094f2ad 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -136,6 +136,8 @@ // Buttons // ------------------------- +@enable-caret: false; + @btn-font-weight: normal; @btn-default-color: #333; diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 525dd4a0b..6c5ef3fed 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -8,6 +8,8 @@ @import "../../../../common/main/resources/less/asc-mixins.less"; // Bootstrap overwrite +@import "../../../../../vendor/bootstrap/less/_functions.less"; +@import "../../../../../vendor/bootstrap/less/_variables.less"; @import "../../../../common/main/resources/less/variables.less"; // @@ -16,30 +18,29 @@ // Core variables and mixins //Bootstrap styles -@import "../../../../../vendor/bootstrap/less/bootstrap.less"; -/* //@import "../../../../vendor/bootstrap/less/variables.less"; -@import "../../../../../vendor/bootstrap/less/mixins.less"; +@import "../../../../../vendor/bootstrap/less/_mixins.less"; +@import "../../../../../vendor/bootstrap/less/_root"; // Reset -@import "../../../../../vendor/bootstrap/less/reboot.less"; +@import "../../../../../vendor/bootstrap/less/_reboot.less"; //@import "print.less"; // Core CSS -@import "../../../../../vendor/bootstrap/less/scaffolding.less"; -@import "../../../../../vendor/bootstrap/less/type.less"; +//@import "../../../../../vendor/bootstrap/less/scaffolding.less"; +@import "../../../../../vendor/bootstrap/less/_type.less"; //@import "code.less"; //@import "grid.less"; //@import "tables.less"; -@import "../../../../../vendor/bootstrap/less/forms.less"; -@import "../../../../../vendor/bootstrap/less/buttons.less"; +@import "../../../../../vendor/bootstrap/less/_forms.less"; +@import "../../../../../vendor/bootstrap/less/_buttons.less"; // Components -@import "../../../../../vendor/bootstrap/less/component-animations.less"; +@import "../../../../../vendor/bootstrap/less/_transitions.less"; //@import "glyphicons.less"; -@import "../../../../../vendor/bootstrap/less/dropdowns.less"; -@import "../../../../../vendor/bootstrap/less/button-groups.less"; -@import "../../../../../vendor/bootstrap/less/input-groups.less"; +@import "../../../../../vendor/bootstrap/less/_dropdown.less"; +@import "../../../../../vendor/bootstrap/less/_button-group.less"; +@import "../../../../../vendor/bootstrap/less/_input-group.less"; //@import "navs.less"; //@import "navbar.less"; //@import "breadcrumbs.less"; @@ -59,15 +60,15 @@ // Components w/ JavaScript //@import "modals.less"; -@import "../../../../../vendor/bootstrap/less/tooltip.less"; +@import "../../../../../vendor/bootstrap/less/_tooltip.less"; //@import "popovers.less"; //@import "carousel.less"; // Utility classes -@import "../../../../../vendor/bootstrap/less/utilities.less"; -@import "../../../../../vendor/bootstrap/less/responsive-utilities.less"; +@import "../../../../../vendor/bootstrap/less/_utilities.less"; +//@import "../../../../../vendor/bootstrap/less/responsive-utilities.less"; + -*/ // // Perfect scrollbar