Skip to content

Commit 9bc0fa7

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 74df65b + 2011fc3 commit 9bc0fa7

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

README.md

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77
----
88

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

1212
[Go to 1.x version](https://github.com/MacGyer/yii2-materializecss/tree/1.x)
13+
1314
[Go to 2.x version](https://github.com/MacGyer/yii2-materializecss/tree/2.x)
1415

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

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

24-
Current Materialize version implemented: 1.0.0-beta
25+
Current Materialize version implemented: 1.0.0-rc.1
2526

2627
## Installation
2728

@@ -78,7 +79,7 @@ The following widgets are currently available:
7879
* DatePicker
7980
* DetailView
8081
* Dropdown
81-
* Fixed Action Button
82+
* FloatingActionButton
8283
* GridView with ActionColumn
8384
* Icon
8485
* LinkPager
@@ -123,18 +124,7 @@ You can copy those templates to any location you wish for further customization.
123124

124125
## Known issues
125126

126-
Despite the styling issues in the side navigation overlay the dependency has been updated to v0.100.1.
127-
See [Issue #4046](https://github.com/Dogfalo/materialize/issues/4046) for details.
128-
129-
Unfortunately the issue still exists in the latest release, but can be fixed temporarily with the following CSS styles:
130-
131-
```
132-
#sidenav-overlay {
133-
z-index: 996;
134-
}
135-
```
136-
137-
Hopefully one of the upcoming releases of Materialize will fix the issue.
127+
Systems operating on normal parameters :)
138128

139129

140130
## Sample layout

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "macgyer/yii2-materializecss",
3-
"minimum-stability": "stable",
3+
"minimum-stability": "RC",
44
"description": "Materialize CSS implementation for Yii2",
55
"keywords": ["materialize", "yii2", "widgets", "material design"],
66
"homepage": "http://macgyer.github.io/yii2-materializecss",
@@ -13,12 +13,12 @@
1313
"role": "Developer"
1414
}
1515
],
16-
"version": "3.0.0",
16+
"version": "3.0.0-RC",
1717
"require": {
1818
"php": ">=5.6.0",
1919
"yiisoft/yii2": "~2.0.0",
2020

21-
"bower-asset/materialize": "1.0.*@beta"
21+
"bower-asset/materialize": "1.0.*@RC"
2222
},
2323
"autoload": {
2424
"psr-4": {

0 commit comments

Comments
 (0)