Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Update bootstrap (fix styles)

Browse source
This commit is contained in:
JuliaSvinareva 2020-05-26 20:18:21 +03:00
parent 517097a4af
commit b354b8ede1
8 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/MenuItem.js
View file

@ -152,7 +152,7 @@ define([
me.trigger('render:before', me); me.trigger('render:before', me);
if (me.caption === '--') { if (me.caption === '--') {
el.addClass('divider'); el.addClass('dropdown-divider');
} else { } else {
if (!this.rendered) { if (!this.rendered) {
el.off('click'); el.off('click');
@ -179,6 +179,8 @@ define([
); );
} }
el.addClass('dropdown-item');
var firstChild = el.children(':first'); var firstChild = el.children(':first');
if (this.checkable && firstChild) { if (this.checkable && firstChild) {

4
apps/common/main/resources/less/buttons.less
View file

@ -5,6 +5,7 @@
.btn { .btn {
border-radius: 1px; border-radius: 1px;
color: @gray-deep; color: @gray-deep;
padding: 1px 3px;
.btnsize(@value) { .btnsize(@value) {
min-width: @value; min-width: @value;
@ -51,9 +52,11 @@
} }
.caret { .caret {
display: inline-block;
width: 7px; width: 7px;
height: 7px; height: 7px;
border: 0; border: 0;
vertical-align: middle;
background-position: @arrow-small-offset-x @arrow-small-offset-y; background-position: @arrow-small-offset-x @arrow-small-offset-y;
position: relative; position: relative;
} }
@ -412,6 +415,7 @@
+ .dropdown-toggle { + .dropdown-toggle {
padding: 0 2px; padding: 0 2px;
} }
flex: none;
} }
> .dropdown-toggle:first-child { > .dropdown-toggle:first-child {

2
apps/common/main/resources/less/combo-dataview.less
View file

@ -73,7 +73,7 @@
margin-right: -@combo-dataview-button-width; margin-right: -@combo-dataview-button-width;
padding-right: @combo-dataview-button-width; padding-right: @combo-dataview-button-width;
//.border-left-radius(0); bootstrap error #border-left-radius(0);
.dataview { .dataview {
height: 46px; height: 46px;

4
apps/common/main/resources/less/combobox.less
View file

@ -1,8 +1,8 @@
.combobox { .combobox {
display: block; display: block;
//&.input-group-sm .btn { .input-sm(); } bootstrap error &.input-group-sm .btn { .form-control-sm(); }
//&.input-group-lg .btn { .input-lg(); } bootstrap error &.input-group-lg .btn { .form-control-lg(); }
&.input-group-nr > .form-control, &.input-group-nr > .form-control,
&.input-group-nr > .btn { &.input-group-nr > .btn {
height: @input-height-base; height: @input-height-base;

6
apps/common/main/resources/less/dropdown-menu.less
View file

@ -3,6 +3,8 @@
} }
.dropdown-menu { .dropdown-menu {
padding: 5px 0;
&.scrollable-menu { &.scrollable-menu {
height: auto; height: auto;
max-height: 400px; max-height: 400px;
@ -26,7 +28,11 @@
} }
li { li {
&.dropdown-item {
padding: 0;
}
& > a { & > a {
display: block;
padding: 5px 20px; padding: 5px 20px;
cursor: pointer; cursor: pointer;

1
apps/common/main/resources/less/header.less
View file

@ -374,6 +374,7 @@
} }
#title-doc-name { #title-doc-name {
color: @white;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;

2
apps/common/main/resources/less/variables.less
View file

@ -136,6 +136,8 @@
// Buttons // Buttons
// ------------------------- // -------------------------
@enable-caret: false;
@btn-font-weight: normal; @btn-font-weight: normal;
@btn-default-color: #333; @btn-default-color: #333;

33
apps/documenteditor/main/resources/less/app.less
View file

@ -8,6 +8,8 @@
@import "../../../../common/main/resources/less/asc-mixins.less"; @import "../../../../common/main/resources/less/asc-mixins.less";
// Bootstrap overwrite // Bootstrap overwrite
@import "../../../../../vendor/bootstrap/less/_functions.less";
@import "../../../../../vendor/bootstrap/less/_variables.less";
@import "../../../../common/main/resources/less/variables.less"; @import "../../../../common/main/resources/less/variables.less";
// //
@ -16,30 +18,29 @@
// Core variables and mixins // Core variables and mixins
//Bootstrap styles //Bootstrap styles
@import "../../../../../vendor/bootstrap/less/bootstrap.less";
/*
//@import "../../../../vendor/bootstrap/less/variables.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 // Reset
@import "../../../../../vendor/bootstrap/less/reboot.less"; @import "../../../../../vendor/bootstrap/less/_reboot.less";
//@import "print.less"; //@import "print.less";
// Core CSS // Core CSS
@import "../../../../../vendor/bootstrap/less/scaffolding.less"; //@import "../../../../../vendor/bootstrap/less/scaffolding.less";
@import "../../../../../vendor/bootstrap/less/type.less"; @import "../../../../../vendor/bootstrap/less/_type.less";
//@import "code.less"; //@import "code.less";
//@import "grid.less"; //@import "grid.less";
//@import "tables.less"; //@import "tables.less";
@import "../../../../../vendor/bootstrap/less/forms.less"; @import "../../../../../vendor/bootstrap/less/_forms.less";
@import "../../../../../vendor/bootstrap/less/buttons.less"; @import "../../../../../vendor/bootstrap/less/_buttons.less";
// Components // Components
@import "../../../../../vendor/bootstrap/less/component-animations.less"; @import "../../../../../vendor/bootstrap/less/_transitions.less";
//@import "glyphicons.less"; //@import "glyphicons.less";
@import "../../../../../vendor/bootstrap/less/dropdowns.less"; @import "../../../../../vendor/bootstrap/less/_dropdown.less";
@import "../../../../../vendor/bootstrap/less/button-groups.less"; @import "../../../../../vendor/bootstrap/less/_button-group.less";
@import "../../../../../vendor/bootstrap/less/input-groups.less"; @import "../../../../../vendor/bootstrap/less/_input-group.less";
//@import "navs.less"; //@import "navs.less";
//@import "navbar.less"; //@import "navbar.less";
//@import "breadcrumbs.less"; //@import "breadcrumbs.less";
@ -59,15 +60,15 @@
// Components w/ JavaScript // Components w/ JavaScript
//@import "modals.less"; //@import "modals.less";
@import "../../../../../vendor/bootstrap/less/tooltip.less"; @import "../../../../../vendor/bootstrap/less/_tooltip.less";
//@import "popovers.less"; //@import "popovers.less";
//@import "carousel.less"; //@import "carousel.less";
// Utility classes // Utility classes
@import "../../../../../vendor/bootstrap/less/utilities.less"; @import "../../../../../vendor/bootstrap/less/_utilities.less";
@import "../../../../../vendor/bootstrap/less/responsive-utilities.less"; //@import "../../../../../vendor/bootstrap/less/responsive-utilities.less";
*/
// //
// Perfect scrollbar // Perfect scrollbar