Skip to content

Commit 1f3ae46

Browse files
OakleyHippoOakleyHippo
OakleyHippo
authored and
OakleyHippo
committed
Revert accidental push
1 parent f5a7500 commit 1f3ae46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2000
-4993
lines changed

.gitattributes

-4
This file was deleted.

.github/FUNDING.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: ardacebi
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
**Describe the bug**
8+
A clear and concise description of what the bug is.
9+
10+
**To Reproduce**
11+
Steps to reproduce the behavior:
12+
1. Go to '...'
13+
2. Click on '....'
14+
3. Scroll down to '....'
15+
4. See error
16+
17+
**Expected behavior**
18+
A clear and concise description of what you expected to happen.
19+
20+
**Screenshots**
21+
If applicable, add screenshots to help explain your problem.
22+
23+
**Environment (please complete the following information):**
24+
- OS: [e.g. Windows 10]
25+
- Browser: [e.g. chrome, safari]
26+
- Browser Version: [e.g. 22]
27+
- Flarum Url: [e.g. https://discuss.flarum.org]
28+
- Flarum Version: [e.g. 0.1.0-beta.8]
29+
30+
**Additional context**
31+
Add any other context about the problem here.
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this theme
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
9+
10+
**Describe the solution you'd like**
11+
A clear and concise description of what you want to happen.
12+
13+
**Describe alternatives you've considered**
14+
A clear and concise description of any alternative solutions or features you've considered.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Icon change request
3+
about: Suggest a replacement for a Material icon
4+
5+
---
6+
7+
**Which icon do you want to be replaced?**
8+
Replace this text with the material icon name you found using the inspector.
9+
10+
**Suggested icon**
11+
Replace this text with the icon you suggest for the replacement.
12+
13+
**Reason**
14+
Replace this text with a clear description and reason why you want this icon replacement.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Missing Material icon
3+
about: Create a missing icon report for us to add support for it
4+
5+
---
6+
7+
**Missing icon**
8+
Replace this text with the font awesome icon that should be replaced.
9+
10+
**Suggested icon**
11+
Replace this text with the Material icon you're suggesting that the font awesome icon should be replaced with.

.idea/flarum-ext-material.iml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CODE_OF_CONDUCT.md

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Contributing
2+
3+
Thank you for your interest in Contributing to our theme 😀.
4+
5+
We sometimes really need help when we're stuck with some issues 😖. But if you help us, we always continue improving our theme for you 😋.
6+
7+
So, let me explain how you can contribute.
8+
9+
We prepared some pre-built templates for you easily submit issues (Bug reports and feature requests) and open Pull Requests to resolve open issues. 📇
10+
11+
Just click on "Create issue" or "Create Pull Request" to see what to do. 📝
12+
13+
But before doing all that stuff, please read our [Code of Conduct](https://github.com/Extum/flarum-theme-material/blob/master/CODE_OF_CONDUCT.md). 🔍

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 Extum
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

LICENSE.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
MIT License Copyright (c) <year> <copyright holders>
1+
MIT License
2+
3+
Copyright (c) 2018 Extum
24

35
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
46

5-
The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
68

7-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

PULL_REQUEST_TEMPLATE.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Fixes #000
2+
3+
**Changes**
4+
5+
{Replace this with the changes you made with this pull request}
6+
7+
**Reviewers should focus on**
8+
9+
{Replace this with the lines and files you made changes}
10+
11+
**Screenshots**
12+
13+
{Replace this with screenshots of your changes}
14+
15+
**Additional Information**
16+
17+
{Replcae this with additional information that might help the reviewers}

README.md

+25-15
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,39 @@
1-
# Material
1+
# Material Design Extension by [Extum](https://github.com/Extum)
2+
![Extum Extension](https://img.shields.io/badge/Extum-Extension-orange.svg)
3+
[![Latest Stable Version](https://img.shields.io/packagist/v/Extum/flarum-ext-material.svg)](https://packagist.org/packages/Extum/flarum-ext-material)
4+
[![Total Downloads](https://img.shields.io/packagist/dt/Extum/flarum-ext-material.svg)](https://packagist.org/packages/Extum/flarum-ext-material)
5+
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/Extum/flarum-ext-material/issues)
6+
[![GitHub issues](https://img.shields.io/github/issues/Extum/flarum-ext-material.svg)](https://github.com/Extum/flarum-ext-material/issues)
7+
[![GitHub forks](https://img.shields.io/github/forks/Extum/flarum-ext-material.svg)](https://github.com/Extum/flarum-ext-material/network)
8+
[![GitHub stars](https://img.shields.io/github/stars/Extum/flarum-ext-material.svg)](https://github.com/Extum/flarum-ext-material/stargazers)
9+
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Extum/flarum-ext-material/master/LICENSE)
210

3-
![License](https://img.shields.io/badge/license-MIT-blue.svg) [![Latest Stable Version](https://img.shields.io/packagist/v/extum/flarum-ext-material.svg)](https://packagist.org/packages/extum/flarum-ext-material)
11+
Material Design Extension for Flarum.
412

5-
A [Flarum](http://flarum.org) extension.
13+
## Try it out
14+
Demo server: https://materialtheme.freeflarum.com/
615

7-
### Installation
16+
Feel free to create test posts, signing up, and playing around however you want. It's a demo server 😉
817

9-
Use [Bazaar](https://discuss.flarum.org/d/5151-flagrow-bazaar-the-extension-marketplace) or install manually with composer:
18+
## Installation
1019

11-
```sh
20+
Use [Bazaar](https://discuss.flarum.org/d/5151-flagrow-bazaar-the-extension-marketplace) or install manually:
21+
22+
```bash
1223
composer require extum/flarum-ext-material
1324
```
1425

15-
### Updating
26+
## Updating
1627

17-
```sh
18-
composer update extum/flarum-ext-material
28+
```bash
29+
composer require extum/flarum-ext-material
30+
php flarum cache:clear
1931
```
2032

21-
### Links
2233

23-
- [Packagist](https://packagist.org/packages/extum/flarum-ext-material)
34+
## Features
35+
- **Material icons**: This extension automatically will include Material Icons, meaning you will get the highest Material experience on your forum.
2436

25-
### Source
37+
- **Cards and elevation**: The extension will replace the flat design Flarum got with shadows, cards and elevations that Material Design has in it's core.
2638

27-
```sh
28-
npm i
29-
```
39+
- **UI improvements**: For you to offer your users the best forum experience they can have, Material Design extension by Extum offers you the best experience you can give with UX improvements and more.

bootstrap.php

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
/**
4+
* This file is part of extum/flarum-ext-material.
5+
*
6+
* Copyright (c) 2018 .
7+
*
8+
*
9+
* For the full copyright and license information, please view the LICENSE.md
10+
* file that was distributed with this source code.
11+
*/
12+
13+
namespace Extum\MDL;
14+
15+
use Illuminate\Contracts\Events\Dispatcher;
16+
17+
return function (Dispatcher $events) {
18+
$events->subscribe(Listeners\AddClientAssets::class);
19+
};

composer.json

+32-29
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
{
2-
"name": "extum/flarum-ext-material",
3-
"description": "Extum Material brings Flarum to the next-level with Material Design!",
4-
"keywords": ["theme", "material-design", "material", "flarum-extension", "flarum", "style"],
5-
"type": "flarum-extension",
6-
"require": {
7-
"flarum/core": ">=0.1.0-beta.10 <0.1.0-beta.12"
8-
},
9-
"authors": [
10-
{
11-
"name": "Extum",
12-
"email": "[email protected]",
13-
"role": "Developer"
14-
}
15-
],
16-
"autoload": {
17-
"psr-4": {"Extum\\MDL\\": "src/"}
18-
},
19-
"extra": {
20-
"flarum-extension": {
21-
"title": "Extum Material",
22-
"icon": {
23-
"image": "icon.jpg",
24-
"backgroundSize": "cover",
25-
"backgroundColor": "#dbc6f9",
26-
"color": "#fff"
27-
}
28-
}
2+
"name": "extum/flarum-ext-material",
3+
"description": "Material Design for Flarum",
4+
"keywords": ["theme", "material-design", "material", "flarum-extension", "flarum", "style"],
5+
"type": "flarum-extension",
6+
"license": "MIT",
7+
"require": {
8+
"flarum/core": "^0.1.0-beta-7"
9+
},
10+
"authors": [
11+
{
12+
"name": "Extum",
13+
"email": "[email protected]",
14+
"role": "Developer"
15+
}
16+
],
17+
"autoload": {
18+
"psr-4": {
19+
"Extum\\MDL\\": "src/"
20+
}
21+
},
22+
"extra": {
23+
"flarum-extension": {
24+
"title": "Material Design",
25+
"icon": {
26+
"image": "icon.jpg",
27+
"backgroundSize": "cover",
28+
"backgroundColor": "#dbc6f9",
29+
"color": "#fff"
30+
}
2931
},
3032
"flagrow": {
31-
"discuss": "https://discuss.flarum.org/d/14335-material-design-extension-theme-by-extum"
33+
"discuss": "https://discuss.flarum.org/d/14335-material-design-extension-theme-by-extum"
3234
}
33-
}
35+
}
36+
}

0 commit comments

Comments
 (0)