Skip to content

Commit

Permalink
Merge v2 with master
Browse files Browse the repository at this point in the history
  • Loading branch information
IanLunn committed Jan 7, 2015
2 parents 99dbc09 + b92ba38 commit 7fc7c36
Show file tree
Hide file tree
Showing 243 changed files with 10,839 additions and 1,568 deletions.
54 changes: 51 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@ module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

version: {
json: {
src: ['bower.json']
},

css: {
options: {
prefix: 'Version[:=]\\s*'
},
src: ['css/hover.css', 'scss/hover.scss', 'less/hover.less']
}

},

sass: {
dist: {
Expand All @@ -15,6 +28,17 @@ module.exports = function(grunt) {
}
},

less: {
dist: {
options: {
style: 'expanded'
},
files: {
'css/hover.css': 'less/hover.less'
}
}
},

cssmin: {
combine: {
files: {
Expand All @@ -28,11 +52,35 @@ module.exports = function(grunt) {
options: {
livereload: true,
},
css: {
files: ['scss/**/*.scss', 'css/*.css', '*.html'],

reload: {
files: ['*.html', 'css/*.css'],
options: {
spawn: false
}
},

scss: {
files: ['scss/**/*.scss'],
tasks: ['sass', 'cssmin'],
options: {
spawn: false,
spawn: false
}
},

less: {
files: ['less/**/*.less'],
tasks: ['less', 'cssmin'],
options: {
spawn: false
}
},

version: {
files: ['package.json'],
tasks: ['version'],
options: {
spawn: false
}
}
},
Expand Down
15 changes: 15 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## 2.0.0 - Jan 7, 2014

- Added lots of new effects
- Added LESS support
- Prefixed all effect names with `hvr-` (can be changed in `scss/_options.scss`)
- Updated some effects for better performance and/or browser support
- Moved default button styles out of library
- Moved all effects into sub folders with the name of the category they belong to
- Renamed `hover` and `hover shadow` effects to `bob` and `bob shadow`
- Removed `hover shadow` effect due to browser inconsistencies courtesy of [this Webkit/Blink bug](https://github.com/IanLunn/Hover/issues/24) which can't be worked around
- Updated `bob` (formerly `hover`) and `hang` effects to work around [this WebKit/Blink bug](https://github.com/IanLunn/Hover/issues/24)
- Change default `animation-timing-function` and `transition-timing-function` values for various effects
- Changed all instances of 'colour' to 'color'
- Added small amount of JS to demo page to prevent `<a href="#"></a>` elements from navigating (not required for hover.css to work)
- Added "What's Included?" section to README.md
Loading

0 comments on commit 7fc7c36

Please sign in to comment.