Merge pull request #509 from oestrogen/master

#78502 Fixed select menu placeholder text-color
Teleopti · Oct 26, 2018 · ed6f9df · ed6f9df
2 parents 268f3f2 + 3102d6b
commit ed6f9df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/css/_form.scss b/css/_form.scss
@@ -6,7 +6,8 @@ label {
 input[type='text'],
 [type='number'],
 input[type='password'],
-select, md-autocomplete {
+select,
+md-autocomplete {
 	border: 1px solid $hover;
 	color: $text-color-standard;
 	-webkit-appearance: none;
@@ -329,12 +330,17 @@ md-select {
 		height: 21px;
 	}
 
-	&:not([disabled]):focus .md-select-value {
-		color: inherit !important;
+	&:not([disabled]):focus .md-select-value > span {
+		color: $text-color-standard;
+	}
+
+	&:not([disabled]):focus .md-select-value.md-select-placeholder {
+		color: $text-color-standard;
 	}
 
 	.md-select-value.md-select-placeholder {
 		padding: 4px 11px;
+		color: $text-color-muted;
 	}
 
 	.md-select-value {
@@ -349,7 +355,6 @@ md-select {
 		border-radius: 4px;
 	}
 
-	.md-select-placeholder,
 	.md-select-icon {
 		color: $text-color-muted;
 	}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "teleopti-styleguide",
-	"version": "1.23.7",
+	"version": "1.23.8",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/Teleopti/styleguide.git"