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

[DE] Update styles for bootstrap-3.3.7

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-03 13:41:44 +03:00
parent 6b56aa8c4b
commit d0636e8a06
6 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/resources/less/asc-mixins.less
View file

@ -99,8 +99,8 @@
.button-otherstates-icon(@icon-class, @icon-size) { .button-otherstates-icon(@icon-class, @icon-size) {
button.over > .@{icon-class} {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);} button.over > .@{icon-class} {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);}
button.active > .@{icon-class}, button.active > .@{icon-class},
button:active > .@{icon-class} {background-position-x: -2*@icon-size; --bgX: -(2*@icon-size);} button:active > .@{icon-class} {background-position-x: -2*@icon-size !important; --bgX: -(2*@icon-size);}
button.disabled > .@{icon-class} {background-position-x: -3*@icon-size; --bgX: -(3*@icon-size);} button.disabled > .@{icon-class} {background-position-x: -3*@icon-size !important; --bgX: -(3*@icon-size);}
} }
.button-otherstates-icon2(@icon-class, @icon-size) { .button-otherstates-icon2(@icon-class, @icon-size) {

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

@ -60,6 +60,14 @@
background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y; background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y;
} }
} }
&:active,
&.active {
&:focus,
&.focus {
outline: none;
}
}
} }
.btn-toolbar { .btn-toolbar {
@ -79,8 +87,8 @@
display: none; display: none;
} }
&:hover, &:hover:not(.disabled),
.over { .over:not(.disabled) {
background-color: @secondary; background-color: @secondary;
} }
@ -141,8 +149,8 @@
background-color: transparent; background-color: transparent;
font-weight: bold; font-weight: bold;
&:hover, &:hover:not(.disabled),
.over { .over:not(.disabled) {
background-color: @secondary; background-color: @secondary;
} }
@ -312,13 +320,13 @@
border: 1px solid @input-border; border: 1px solid @input-border;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
&:hover, &:hover:not(.disabled),
.over { .over:not(.disabled) {
background-color: @secondary !important; background-color: @secondary !important;
} }
&:active, &:active:not(.disabled),
&.active { &.active:not(.disabled) {
background-color: @primary !important; background-color: @primary !important;
color: white; color: white;
} }
@ -346,13 +354,13 @@
margin-top: 5px; margin-top: 5px;
} }
&:hover, &:hover:not(.disabled),
.over { .over:not(.disabled) {
background-color: @secondary !important; background-color: @secondary !important;
} }
&:active, &:active:not(.disabled),
&.active { &.active:not(.disabled) {
background-color: @primary !important; background-color: @primary !important;
color: white; color: white;
} }
@ -379,13 +387,13 @@
background-repeat: no-repeat; background-repeat: no-repeat;
} }
&:hover, &:hover:not(.disabled),
.over { .over:not(.disabled) {
background-color: @secondary !important; background-color: @secondary !important;
} }
&:active, &:active:not(.disabled),
&.active { &.active:not(.disabled) {
background-color: @primary !important; background-color: @primary !important;
} }

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

@ -36,9 +36,14 @@
.form-control { .form-control {
.border-right-radius(0); .border-right-radius(0);
border-right: 0; border-right: 0;
position: initial;
z-index: initial;
float: none;
} }
.btn { .btn,
.btn:hover,
.btn:focus {
.border-left-radius(0); .border-left-radius(0);
border-left: 0; border-left: 0;
border-color: @input-border; border-color: @input-border;

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

@ -1,8 +1,5 @@
.dropdown-menu > .disabled > a { .dropdown-menu > .disabled > a {
&:hover, cursor: default;
&:focus {
cursor: default;
}
} }
.dropdown-menu { .dropdown-menu {

8
apps/documenteditor/main/resources/less/rightmenu.less
View file

@ -194,14 +194,14 @@
.btn-edit-table {background-position: 0 0;} .btn-edit-table {background-position: 0 0;}
button.over .btn-edit-table {background-position: -28px 0;} button.over .btn-edit-table {background-position: -28px 0;}
.btn-group.open .btn-edit-table, .btn-group.open .btn-edit-table,
button.active .btn-edit-table, button.active:not(.disabled) .btn-edit-table,
button:active .btn-edit-table {background-position: -56px 0;} button:active:not(.disabled) .btn-edit-table {background-position: -56px 0;}
.btn-change-shape {background-position: 0 -16px;} .btn-change-shape {background-position: 0 -16px;}
button.over .btn-change-shape {background-position: -28px -16px;} button.over .btn-change-shape {background-position: -28px -16px;}
.btn-group.open .btn-change-shape, .btn-group.open .btn-change-shape,
button.active .btn-change-shape, button.active:not(.disabled) .btn-change-shape,
button:active .btn-change-shape {background-position: -56px -16px;} button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;}
.combo-pattern-item { .combo-pattern-item {
.background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px); .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px);

3
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -58,6 +58,9 @@
white-space: nowrap; white-space: nowrap;
padding-top: 3px; padding-top: 3px;
vertical-align: top; vertical-align: top;
&.dropup {
position: initial;
}
} }
.separator { .separator {