Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
MacGyer committed Jun 2, 2018
2 parents 74df65b + 2011fc3 commit 9bc0fa7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
22 changes: 6 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

----

This is the current, actively developed 3.x branch which will implement Materialize version 1.0 and thus breaking backwards compatibility.
**Please note: This branch is work in progress right now. No release has been published. Do not use in production versions until further notice.**
This is the current, actively developed 3.x branch which is implementing Materialize version 1.0 and thus breaking backwards compatibility.
**Please note: This branch is in beta phase right now. You might use it, but on your own liability.**

[Go to 1.x version](https://github.com/MacGyer/yii2-materializecss/tree/1.x)

[Go to 2.x version](https://github.com/MacGyer/yii2-materializecss/tree/2.x)

----
Expand All @@ -21,7 +22,7 @@ See [official documentation](http://macgyer.github.io/yii2-materializecss/) for

**New**: Have a look at the [official demo page](https://yii2-materializecss.pluspunkt-coding.de) to see the repo in action.

Current Materialize version implemented: 1.0.0-beta
Current Materialize version implemented: 1.0.0-rc.1

## Installation

Expand Down Expand Up @@ -78,7 +79,7 @@ The following widgets are currently available:
* DatePicker
* DetailView
* Dropdown
* Fixed Action Button
* FloatingActionButton
* GridView with ActionColumn
* Icon
* LinkPager
Expand Down Expand Up @@ -123,18 +124,7 @@ You can copy those templates to any location you wish for further customization.

## Known issues

Despite the styling issues in the side navigation overlay the dependency has been updated to v0.100.1.
See [Issue #4046](https://github.com/Dogfalo/materialize/issues/4046) for details.

Unfortunately the issue still exists in the latest release, but can be fixed temporarily with the following CSS styles:

```
#sidenav-overlay {
z-index: 996;
}
```

Hopefully one of the upcoming releases of Materialize will fix the issue.
Systems operating on normal parameters :)


## Sample layout
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "macgyer/yii2-materializecss",
"minimum-stability": "stable",
"minimum-stability": "RC",
"description": "Materialize CSS implementation for Yii2",
"keywords": ["materialize", "yii2", "widgets", "material design"],
"homepage": "http://macgyer.github.io/yii2-materializecss",
Expand All @@ -13,12 +13,12 @@
"role": "Developer"
}
],
"version": "3.0.0",
"version": "3.0.0-RC",
"require": {
"php": ">=5.6.0",
"yiisoft/yii2": "~2.0.0",

"bower-asset/materialize": "1.0.*@beta"
"bower-asset/materialize": "1.0.*@RC"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 9bc0fa7

Please sign in to comment.