Improved team search and team managing #18

Merged
konrad merged 14 commits from feature/team-search into master 2019-03-03 12:50:06 +00:00
2 changed files with 36 additions and 36 deletions
Showing only changes of commit eef04185cd - Show all commits

View File

@ -128,7 +128,7 @@ fieldset[disabled] .multiselect {
.multiselect__single {
&:focus {
border-color: #a8a8a8;
border-color: $primary;
outline: none;
}
padding-left: 5px;
@ -144,7 +144,7 @@ fieldset[disabled] .multiselect {
display: block;
padding: 8px 40px 0 8px;
border-radius: 5px;
border: 1px solid #e8e8e8;
border: 1px solid $multiselect-border;
background: $white;
font-size: 14px;
}
@ -157,7 +157,7 @@ fieldset[disabled] .multiselect {
margin-right: 10px;
color: $white;
line-height: 1;
background: #41b883;
background: $multiselect-highlight;
margin-bottom: 5px;
white-space: nowrap;
overflow: hidden;
@ -181,14 +181,14 @@ fieldset[disabled] .multiselect {
border-radius: 5px;
&:after {
content: "×";
color: #266d4d;
color: darken($multiselect-highlight, 20);
font-size: 14px;
}
&:focus, &:hover {
background: #369a6e;
background: lighten($multiselect-highlight, 10);
}
&:focus:after, &:hover:after {
color: white;
color: $white;
}
}
@ -198,13 +198,12 @@ fieldset[disabled] .multiselect {
box-sizing: border-box;
display: block;
overflow: hidden;
padding: 8px 12px 0;
padding-right: 30px;
padding: 8px 30px 0 12px;
white-space: nowrap;
margin: 0;
text-decoration: none;
border-radius: 5px;
border: 1px solid #e8e8e8;
border: 1px solid $multiselect-border;
cursor: pointer;
}
@ -227,17 +226,17 @@ fieldset[disabled] .multiselect {
position: relative;
right: 0;
top: 65%;
color: #999;
color: darken($multiselect-border, 30);
margin-top: 4px;
border-style: solid;
border-width: 5px 5px 0 5px;
border-color: #999999 transparent transparent transparent;
border-color: darken($multiselect-border, 30) transparent transparent transparent;
content: "";
}
}
.multiselect__placeholder {
color: #adadad;
color: darken($white, 15);
display: inline-block;
margin-bottom: 10px;
padding-top: 2px;
@ -254,7 +253,7 @@ fieldset[disabled] .multiselect {
width: 100%;
max-height: 240px;
overflow: auto;
border: 1px solid #e8e8e8;
border: 1px solid $multiselect-border;
border-top: none;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
@ -262,7 +261,7 @@ fieldset[disabled] .multiselect {
-webkit-overflow-scrolling: touch;
}
.multiselect__content {
.multiselect__content, .content ul.multiselect__content {
list-style: none;
display: inline-block;
padding: 0;
@ -273,12 +272,9 @@ fieldset[disabled] .multiselect {
.multiselect--above .multiselect__content-wrapper {
bottom: 100%;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
border-radius: 5px 5px 0 0;
border-bottom: none;
border-top: 1px solid #e8e8e8;
border-top: 1px solid $multiselect-border;
}
.multiselect__content::webkit-scrollbar {
@ -312,18 +308,18 @@ fieldset[disabled] .multiselect {
}
.multiselect__option--highlight {
background: #41b883;
background: $multiselect-highlight;
outline: none;
color: white;
color: $white;
&:after {
content: attr(data-select);
background: #41b883;
color: white;
background: $multiselect-highlight;
color: $white;
}
}
.multiselect__option--selected {
background: #f3f3f3;
background: darken($white, 10);
color: $multiselect-dark;
font-weight: bold;
&:after {
@ -331,10 +327,10 @@ fieldset[disabled] .multiselect {
color: silver;
}
&.multiselect__option--highlight {
background: #ff6a6a;
background: $multiselect-highlight-negative;
color: $white;
&:after {
background: #ff6a6a;
background: $multiselect-highlight-negative;
content: attr(data-deselect);
color: $white;
}
@ -342,23 +338,23 @@ fieldset[disabled] .multiselect {
}
.multiselect--disabled {
background: #ededed;
background: $multiselect-disabled;
pointer-events: none;
.multiselect__current, .multiselect__select {
background: #ededed;
color: #a6a6a6;
background: $multiselect-disabled;
color: darken($multiselect-disabled, 40);
}
}
.multiselect__option--disabled {
background: #ededed !important;
color: #a6a6a6 !important;
background: $multiselect-disabled !important;
color: darken($multiselect-disabled, 40) !important;
cursor: text;
pointer-events: none;
}
.multiselect__option--group {
background: #ededed;
background: $multiselect-disabled;
color: $multiselect-dark;
&.multiselect__option--highlight {
background: $multiselect-dark;
@ -370,14 +366,14 @@ fieldset[disabled] .multiselect {
}
.multiselect__option--disabled.multiselect__option--highlight {
background: #dedede;
background: $multiselect-disabled;
}
.multiselect__option--group-selected.multiselect__option--highlight {
background: #ff6a6a;
background: $multiselect-highlight-negative;
color: $white;
&:after {
background: #ff6a6a;
background: $multiselect-highlight-negative;
content: attr(data-deselect);
color: $white;
}

View File

@ -26,4 +26,8 @@ $navbar-padding: 1.5em;
$transition: 150ms ease;
$multiselect-primary: $green;
$multiselect-dark: #35495e;
$multiselect-dark: #35495e;
$multiselect-border: #e8e8e8;
$multiselect-highlight: $green;
$multiselect-highlight-negative: $red;
$multiselect-disabled: darken(#fff, 40);