Skip to content

Commit

Permalink
fix(select): added color for placeholder (#UIM-194) (#314)
Browse files Browse the repository at this point in the history
  • Loading branch information
lskramarov authored and pimenovoleg committed Oct 23, 2019
1 parent 8a59154 commit ec4a91d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/mosaic-dev/select/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { OPTIONS } from './options';
encapsulation: ViewEncapsulation.None
})
export class DemoComponent implements OnInit {
singleSelected = 'Normal';
singleSelected = '';
multipleSelected = ['Normal', 'Hovered', 'Selected', 'Selected1'];

singleSelectedWithSearch = 'Moscow';
Expand Down
2 changes: 1 addition & 1 deletion packages/mosaic-dev/select/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<div class="dev-container">

<mc-form-field>
<mc-select [(value)]="singleSelected">
<mc-select [(value)]="singleSelected" [placeholder]="'placeholder'">
<mc-option value="Disabled" disabled>Disabled</mc-option>
<mc-option value="Normal">Normal</mc-option>
<mc-option value="Hovered">Hovered</mc-option>
Expand Down
6 changes: 3 additions & 3 deletions packages/mosaic/input/_input-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
color: map-get($foreground, text);;

&::placeholder {
color: map-get($foreground, disabled-text);;
color: map-get($foreground, disabled-text);
}

&::-ms-input-placeholder {
color: map-get($foreground, disabled-text);;
color: map-get($foreground, disabled-text);
}

&::-webkit-input-placeholder {
color: map-get($foreground, disabled-text);;
color: map-get($foreground, disabled-text);
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions packages/mosaic/select/_select-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
}
}

.mc-select__placeholder {
color: map-get($foreground, disabled-text);
}

.mc-select__panel {
border: {
color: mc-color($second);
Expand Down

0 comments on commit ec4a91d

Please sign in to comment.