Merge branch 'master' into vue

This commit is contained in:
Julius Härtl
2019-04-25 18:11:03 +02:00
194 changed files with 9532 additions and 4059 deletions

View File

@@ -42,6 +42,7 @@ $compact-board-last-item-margin: 5px 10px 10px;
@import 'animations';
@import 'compact-mode';
@import 'autocomplete';
@import 'comments';
/**
* General styles
@@ -148,6 +149,22 @@ input.input-inline {
}
#app-settings-content {
overflow: initial;
.ui-select-match-item {
border: 1px solid var(--color-background-darker) !important;
.select-label {
color: var(--color-main-text);
}
}
p.hint {
margin-top: 10px;
color: var(--color-text-light);
}
}
/**
* Board view
*/
@@ -431,7 +448,7 @@ input.input-inline {
margin: $board-item-margin;
white-space: normal;
position: relative;
box-shadow: 0 0 3px var(--color-background-darker, $color-darkgrey);
box-shadow: 0 0 3px 1px var(--color-background-darker, $color-darkgrey);
border-radius: 3px;
transition: margin 250ms linear;
@@ -633,7 +650,7 @@ input.input-inline {
min-height: 16px;
}
.popovermenu {
.popovermenu:not(.action-item__menu) {
z-index: 999;
opacity: 1;
display: block;
@@ -975,8 +992,12 @@ input.input-inline {
img {
max-width: 24px;
max-height: 24px;
opacity: 1;
}
}
& > img {
opacity: 0.7;
}
}
.activitysubject.commentAuthor {
@@ -1241,6 +1262,7 @@ input.input-inline {
display: inline-block;
overflow: hidden;
vertical-align: middle;
flex-grow: 1;
}
.icon-delete {
@@ -1266,7 +1288,7 @@ input.input-inline {
width: 32px;
height: 32px;
.icon-group {
.icon-group, .icon {
padding: 16px;
opacity: 0.5;
}
@@ -1399,6 +1421,10 @@ input.input-inline {
}
.select2-search-field {
margin-right: -10px;
flex-grow: 1;
input {
width: 100% !important;
}
}
}