Skip to content

Commit 723cc60

Browse files
committed
updated Materialize to v0.97.5
1 parent efc0563 commit 723cc60

File tree

5 files changed

+20
-29
lines changed

5 files changed

+20
-29
lines changed

assets/README.md

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
Materialize, a CSS Framework based on material design
77

8-
### Current Version : v0.97.3
8+
### Current Version : v0.97.4
99

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

1616
## Changelog
17+
- v0.97.4 (Dec 20, 2015)
18+
- Added Jasmine testing with Travis CI
19+
- Select bugfixes
20+
- Grid Offset bugfix
21+
- Dropdown overflow bugfix
22+
- Range slider error bugfix
1723
- v0.97.3 (Nov 15, 2015)
1824
- Meteor font issues fixed
1925
- Select rendering issue fixed
@@ -48,28 +54,6 @@ Chrome 35+, Firefox 31+, Safari 7+, IE 10+
4854
- Programmatic control of FAB to open/close added
4955
- Programmatic control of slider to play/pause added
5056
- Plus many more bug fixes
51-
- v0.96.1 (April 6, 2015)
52-
- Dropdown Fixes
53-
- Materialize functions fixed for Meteor
54-
- v0.96.0 (April 1, 2015)
55-
- **Toasts, transitions, scrollfire added under Materialize namespace**
56-
- **Dropdown is now created as a child of its parent**
57-
- Collapsibles supports nesting
58-
- Modal Bottom Sheet added
59-
- Indeterminate Checkboxes added
60-
- New Checkbox Style Added
61-
- Text Inputs supports placeholder/readonly
62-
- Google Inbox-like Collapsible added
63-
- Text Character Counter added
64-
- Waves no longer breaks on SVG's
65-
66-
- v0.95.3 (Feb 25, 2015)
67-
- Parallax image loading / responsiveness fixes
68-
- Date picker supports month/year as dropdown
69-
- Dismissable collection items
70-
- Avatar collection items
71-
- Pagination Added
72-
- ScrollFire fixes
7357

7458

7559
## Contributing

assets/css/materialize.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Materialize v0.97.4 (http://materializecss.com)
2+
* Materialize v0.97.5 (http://materializecss.com)
33
* Copyright 2014-2015 Materialize
44
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
55
*/

assets/css/materialize.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/materialize.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
/*!
2-
* Materialize v0.97.4 (http://materializecss.com)
2+
* Materialize v0.97.5 (http://materializecss.com)
33
* Copyright 2014-2015 Materialize
44
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
55
*/
66
// Check for jQuery.
77
if (typeof(jQuery) === 'undefined') {
8-
var jQuery = $ = require('jQuery');
8+
var jQuery;
9+
// Check if require is a defined function.
10+
if (typeof(require) === 'function') {
11+
jQuery = $ = require('jQuery');
12+
// Else use the dollar sign alias.
13+
} else {
14+
jQuery = $;
15+
}
916
};/*
1017
* jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
1118
*

assets/js/materialize.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)