Skip to content

Commit 02ec56e

Browse files
committed
Merge branch 'master' into dev
2 parents d7e9e8a + 9029a90 commit 02ec56e

File tree

7 files changed

+38
-9
lines changed

7 files changed

+38
-9
lines changed

.gitignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Global
2+
.composer
3+
composer.lock
4+
package-lock.json
5+
vendor/
6+
node_modules/
7+
dist/
8+
9+
# Flextype Site Specific
10+
var/
11+
12+
# OS Generated
13+
.DS_Store*
14+
ehthumbs.db
15+
Icon?
16+
Thumbs.db
17+
*.swp
18+
19+
# phpstorm
20+
.idea/*

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
<a name="1.4.0"></a>
2+
# [1.4.0](https://github.com/flextype-plugins/icon/compare/v1.3.0...v1.4.0) (2020-12-07)
3+
4+
### Features
5+
6+
* **core** update code base for new Flextype 0.9.12
7+
18
<a name="1.3.0"></a>
2-
# [1.3.0](https://github.com/flextype-plugins/form-icon/compare/v1.2.0...v1.3.0) (2020-08-25)
9+
# [1.3.0](https://github.com/flextype-plugins/icon/compare/v1.2.0...v1.3.0) (2020-08-25)
310

411
### Features
512

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018-2020 Sergey Romanenko
3+
Copyright (c) 2021 Sergey Romanenko
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Icon Plugin for <a href="http://flextype.org/">Flextype</a></h1>
22

33
<p align="center">
4-
<a href="https://github.com/flextype-plugins/icon/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/icon/icon.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/github/downloads/flextype-plugins/icon/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.11-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
4+
<a href="https://github.com/flextype-plugins/icon/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/icon/icon.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/github/downloads/flextype-plugins/icon/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.12-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
55
</p>
66

77
Icon plugin to present [Font Awesome](https://fontawesome.com/) icons set for Flextype.
@@ -14,7 +14,7 @@ The following dependencies need to be installed for Icon Plugin.
1414

1515
| Item | Version | Download |
1616
|---|---|---|
17-
| [flextype](https://github.com/flextype/flextype) | 0.9.11 | [download](https://github.com/flextype/flextype/releases) |
17+
| [flextype](https://github.com/flextype/flextype) | 0.9.12 | [download](https://github.com/flextype/flextype/releases) |
1818
| [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
1919

2020
## Installation
@@ -46,4 +46,4 @@ echo Icon::icon('fab fa-apple');
4646

4747
## LICENSE
4848
[The MIT License (MIT)](https://github.com/flextype-plugins/icon/blob/master/LICENSE.txt)
49-
Copyright (c) 2018-2020 [Sergey Romanenko](https://github.com/Awilum)
49+
Copyright (c) 2021 [Sergey Romanenko](https://github.com/Awilum)

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
"issues": "https://github.com/flextype-plugins/icon/issues"
1717
},
1818
"require": {
19-
"php": ">=7.3.0"
19+
"php": ">=7.3.0",
20+
"flextype-components/arrays" : "3.0.1",
21+
"flextype-components/filesystem": "2.0.8"
2022
},
2123
"config": {
2224
"apcu-autoloader": true,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Icon",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "Icon plugin to present Font Awesome icons set for Flextype.",
55
"homepage": "https://flextype.org",
66
"author": "Sergey Romanenko",

plugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Icon
2-
version: 1.3.0
2+
version: 1.4.0
33
description: Icon plugin to present Font Awesome icons set for Flextype.
44
icon: fab fa-font-awesome-flag
55
author:
@@ -11,5 +11,5 @@ bugs: https://github.com/flextype-plugins/icon/issues
1111
license: MIT
1212

1313
dependencies:
14-
flextype: 0.9.11
14+
flextype: 0.9.12
1515
twig: '>=1.0.0'

0 commit comments

Comments
 (0)