Merge pull request #60 from CastleCSS/develop

dariusrosendahl · web-flow · commit a83fda95e972 · 2019-03-19T10:52:26.000+01:00
Develop
diff --git a/sass/component/label.scss b/sass/component/label.scss
@@ -25,6 +25,10 @@
 	z-index: 2;
 	pointer-events: none;
 }
+%label-default-textarea {
+	@extend %label-default;
+	top: 0;
+}
 
 %label-active-static {
 	color: $input-label-color-focus;
@@ -211,15 +215,15 @@
 			}
 		}
 	}
-}
 
-.form-textarea {
+	&.form-textarea {
 
-	label[for] {
-		transform: translateY(0);
-		top: $margin-default;
-	}
+		label[for] {
+			transform: translateY(0);
+			top: $margin-default;
+		}
 
+	}
 }
 
 .label-left {

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@`
`25`	`25`	`z-index: 2;`
`26`	`26`	`pointer-events: none;`
`27`	`27`	`}`
	`28`	`+%label-default-textarea {`
	`29`	`+ @extend %label-default;`
	`30`	`+ top: 0;`
	`31`	`+}`
`28`	`32`
`29`	`33`	`%label-active-static {`
`30`	`34`	`color: $input-label-color-focus;`
`@@ -211,15 +215,15 @@`
`211`	`215`	`}`
`212`	`216`	`}`
`213`	`217`	`}`
`214`		`-}`
`215`	`218`
`216`		`-.form-textarea {`
	`219`	`+ &.form-textarea {`
`217`	`220`
`218`		`- label[for] {`
`219`		`- transform: translateY(0);`
`220`		`- top: $margin-default;`
`221`		`- }`
	`221`	`+ label[for] {`
	`222`	`+ transform: translateY(0);`
	`223`	`+ top: $margin-default;`
	`224`	`+ }`
`222`	`225`
	`226`	`+ }`
`223`	`227`	`}`
`224`	`228`
`225`	`229`	`.label-left {`