Skip to content

Commit

Permalink
updated Materialize to v0.97.5
Browse files Browse the repository at this point in the history
  • Loading branch information
skydiver committed Dec 27, 2015
1 parent efc0563 commit 723cc60
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 29 deletions.
30 changes: 7 additions & 23 deletions assets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Materialize, a CSS Framework based on material design

### Current Version : v0.97.3
### Current Version : v0.97.4

## Sass Requirements:
- Ruby Sass 3.3+, LibSass 0.6+
Expand All @@ -14,6 +14,12 @@ Materialize, a CSS Framework based on material design
Chrome 35+, Firefox 31+, Safari 7+, IE 10+

## Changelog
- v0.97.4 (Dec 20, 2015)
- Added Jasmine testing with Travis CI
- Select bugfixes
- Grid Offset bugfix
- Dropdown overflow bugfix
- Range slider error bugfix
- v0.97.3 (Nov 15, 2015)
- Meteor font issues fixed
- Select rendering issue fixed
Expand Down Expand Up @@ -48,28 +54,6 @@ Chrome 35+, Firefox 31+, Safari 7+, IE 10+
- Programmatic control of FAB to open/close added
- Programmatic control of slider to play/pause added
- Plus many more bug fixes
- v0.96.1 (April 6, 2015)
- Dropdown Fixes
- Materialize functions fixed for Meteor
- v0.96.0 (April 1, 2015)
- **Toasts, transitions, scrollfire added under Materialize namespace**
- **Dropdown is now created as a child of its parent**
- Collapsibles supports nesting
- Modal Bottom Sheet added
- Indeterminate Checkboxes added
- New Checkbox Style Added
- Text Inputs supports placeholder/readonly
- Google Inbox-like Collapsible added
- Text Character Counter added
- Waves no longer breaks on SVG's

- v0.95.3 (Feb 25, 2015)
- Parallax image loading / responsiveness fixes
- Date picker supports month/year as dropdown
- Dismissable collection items
- Avatar collection items
- Pagination Added
- ScrollFire fixes


## Contributing
Expand Down
2 changes: 1 addition & 1 deletion assets/css/materialize.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Materialize v0.97.4 (http://materializecss.com)
* Materialize v0.97.5 (http://materializecss.com)
* Copyright 2014-2015 Materialize
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/css/materialize.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions assets/js/materialize.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
/*!
* Materialize v0.97.4 (http://materializecss.com)
* Materialize v0.97.5 (http://materializecss.com)
* Copyright 2014-2015 Materialize
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
*/
// Check for jQuery.
if (typeof(jQuery) === 'undefined') {
var jQuery = $ = require('jQuery');
var jQuery;
// Check if require is a defined function.
if (typeof(require) === 'function') {
jQuery = $ = require('jQuery');
// Else use the dollar sign alias.
} else {
jQuery = $;
}
};/*
* jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
*
Expand Down
4 changes: 2 additions & 2 deletions assets/js/materialize.min.js

Large diffs are not rendered by default.

0 comments on commit 723cc60

Please sign in to comment.