Skip to content

Commit bb79452

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents b3f7507 + af353a4 commit bb79452

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66

77
----
88

9-
This is the current, actively developed 2.x branch which introduces some breaking changes compared to version 1.x.
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.**
1011

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

1315
----
1416

@@ -17,9 +19,9 @@ This package integrates the Materialize CSS framework into [Yii2](http://www.yii
1719

1820
See [official documentation](http://macgyer.github.io/yii2-materializecss/) for detailed information.
1921

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

22-
Current Materialize version implemented: 0.100.1
24+
Current Materialize version implemented: 1.0.0-beta
2325

2426
## Installation
2527

@@ -28,13 +30,13 @@ If you don't have Composer you can get it here: https://getcomposer.org/
2830

2931
You also should install the Composer Asset Plugin to handle NPM and Bower assets:
3032
```
31-
$ composer global require "fxp/composer-asset-plugin:~1.2"
33+
$ composer global require "fxp/composer-asset-plugin:~1.4"
3234
```
3335

3436
To install the package add the following to the ```require``` section of your composer.json:
3537
```
3638
"require": {
37-
"macgyer/yii2-materializecss": "*"
39+
"macgyer/yii2-materializecss": "~3.0.0"
3840
},
3941
```
4042

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
"authors": [
1010
{
1111
"name": "Christoph Erdmann",
12-
"homepage": "http://www.medienpol.de",
12+
"homepage": "https://www.matero.de",
1313
"role": "Developer"
1414
}
1515
],
16-
"version": "2.0.0",
16+
"version": "3.0.0",
1717
"require": {
18-
"php": ">=5.6.0",
19-
"yiisoft/yii2": "~2.0.0",
18+
"php": ">=7.0.0",
19+
"yiisoft/yii2": "~2.0.14",
2020

21-
"bower-asset/materialize": "0.100.1"
21+
"bower-asset/materialize": "1.0.0-beta"
2222
},
2323
"autoload": {
2424
"psr-4": {

0 commit comments

Comments
 (0)