taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Color selector fixes for transparent color

stable
Xavier Julián 2016-09-22 11:06:09 +02:00 committed by David Barragán Merino
parent b7cc9e9c1e
commit 62a20552a4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/modules/components/color-selector/color-selector.jade
View File

@ -28,11 +28,12 @@
.display-custom-color.empty-color( .display-custom-color.empty-color(
ng-if="!vm.color" ng-if="!vm.color"
) )
.display-custom-color( .display-custom-color-wrapper
ng-if="vm.color" .display-custom-color(
ng-style="{'background': vm.color}" ng-if="vm.color"
ng-click="vm.onSelectDropdownColor(vm.color)" ng-style="{'background': vm.color}"
) ng-click="vm.onSelectDropdownColor(vm.color)"
)
input.custom-color-input( input.custom-color-input(
type="text" type="text"
maxlength="7" maxlength="7"

6
app/modules/components/color-selector/color-selector.scss
View File

@ -52,16 +52,20 @@
} }
.custom-color-selector { .custom-color-selector {
align-items: center;
display: flex; display: flex;
.custom-color-input { .custom-color-input {
margin: 0; margin: 0;
width: 100%; width: 100%;
} }
.display-custom-color-wrapper {
background: $mass-white;
margin-right: .5rem;
}
.display-custom-color { .display-custom-color {
@include color-selector-option; @include color-selector-option;
flex-shrink: 0; flex-shrink: 0;
margin: 0; margin: 0;
margin-right: .5rem;
&.empty-color { &.empty-color {
@include empty-color(34); @include empty-color(34);
cursor: default; cursor: default;