Skip to content

Feature/default label not working in version 1.0.7 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 5, 2017
Merged

Feature/default label not working in version 1.0.7 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f51459
Hide label when input field has focus and/or a value
pauldenieuwezaak May 2, 2017
e4867b6
Labels for inputs that are used as placeholders now require the class…
pauldenieuwezaak May 3, 2017
009d057
- Deleted (label) element in selector for placeholder (now more gener…
pauldenieuwezaak May 3, 2017
f82ab46
Reverted change that messed up the label-bottom position
pauldenieuwezaak May 3, 2017
49f3967
Merge remote-tracking branch 'origin/develop' into feature/#6_Default…
dariusrosendahl Jul 4, 2017
ba8709b
2.0.0
dariusrosendahl Jul 5, 2017
a948c7c
- Version bump to 2.0.0 because of breaking changes
dariusrosendahl Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "castlecss-forms",
"version": "1.0.7",
"version": "2.0.0",
"description": "Easy to use forms for CastleCSS",
"main": "index.js",
"scripts": {
Expand All @@ -15,7 +15,8 @@
],
"author": "Maarten van der Haar <maarten@denieuwezaak.nl> (http://www.castlecss.com)",
"contributors": [
"Darius Rosendahl <maarten@denieuwezaak.nl> (http://www.castlecss.com)",
"Darius Rosendahl <darius@denieuwezaak.nl> (http://www.castlecss.com)",
"Paul Stegeman <paul@denieuwezaak.nl> (http://www.castlecss.com)",
"Björn Borneman <bjorn@denieuwezaak.nl> (http://www.castlecss.com)",
"Amber Brookhuis <darius@denieuwezaak.nl> (http://www.castlecss.com)"
],
Expand All @@ -25,7 +26,7 @@
},
"homepage": "https://github.com/CastleCSS/castlecss-forms#readme",
"dependencies": {
"castlecss-core": "^2.3.0",
"castlecss-core": "^2.4.0",
"jquery": "^3.1.1"
},
"devDependencies": {
Expand Down
46 changes: 23 additions & 23 deletions sass/component/label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,28 @@

[class^="label-"],
[class*=" label-"] {
.input-icon {
label[for] {
left: $margin-default*4.5;
}
}

.form-field {

&.has-focus label[for],
&.has-value label[for] {
&.has-focus .placeholder,
&.has-value .placeholder {
transform: translateY(-100%);
top: 0;
color: $input-label-color-focus;
font-size: 70%;
line-height: 15px;
}
}



.input-textarea label[for] {
top: $margin-default/2;
transform: translateY(0);
}

.input-icon {
label[for] {
left: $margin-default*4.5;
}
}
}
}

.form-field {

label[for]:not(.input-control) {
.placeholder {
transition: $input-transition;
position: absolute;
color: $input-label-color;
Expand All @@ -43,6 +35,16 @@
z-index: 2;
}

&.has-focus, &.has-value {
.placeholder {
display: none;

[class*="label-"] &
{
display: block;
}
}
}
}

.label-bottom, .label-top {
Expand Down Expand Up @@ -75,7 +77,7 @@
&.has-focus,
&.has-value {

label[for] {
.placeholder {
color: $input-label-color-focus;
font-size: 65%;
line-height: 22px;
Expand All @@ -85,7 +87,6 @@
}

.input-combined {

~ label[for] {
margin-left: $margin-default*3;
}
Expand All @@ -108,14 +109,14 @@

.label-top {
.form-field {

&.has-focus,
&.has-value {

label[for] {
.placeholder {
top: 0;
transform: translateY(0);
}

}
}

Expand All @@ -129,7 +130,6 @@
}

.label-left {

.input-indicator {
left: inherit;
right: 0;
Expand Down