Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2014-10-01 09:45:26 +02:00
commit 4d9bda3d66
3 changed files with 14 additions and 3 deletions

5
.gitignore vendored
View File

@ -1,3 +1,6 @@
# https://git-scm.com/docs/gitignore
# https://help.github.com/articles/ignoring-files
# Example .gitignore files: https://github.com/github/gitignore
# Example .gitignore files: https://github.com/github/gitignore
Thumbs.db
.DS_Store

View File

@ -66,10 +66,17 @@
// Ripple effect on click
input[type=checkbox]:not(:checked) ~ .check:after {
.animation(rippleOff 500ms);
.animation(rippleOff 500ms linear forwards);
}
input[type=checkbox]:checked ~ .check:after {
.animation(rippleOn 500ms);
.animation(rippleOn 500ms linear forwards);
}
// Make animate quickly when not hover
&:not(:hover) input[type=checkbox] ~ .check {
&:before, &:after {
.animation-duration(1ms);
}
}
// Style for disabled inputs

View File

@ -98,6 +98,7 @@
-moz-animation-duration: @duration;
-ms-animation-duration: @duration;
-o-animation-duration: @duration;
animation-duration: @duration;
}
.animation-fill-mode(@mode) {
-webkit-animation-fill-mode: @mode;