Skip to content

Commit

Permalink
Merge pull request #61 from 540co/develop
Browse files Browse the repository at this point in the history
Merge latest develop
  • Loading branch information
ostranme authored Aug 7, 2018
2 parents 79edeab + dc7cd40 commit 543cbc1
Show file tree
Hide file tree
Showing 13 changed files with 97 additions and 16 deletions.
1 change: 1 addition & 0 deletions .assets/govicons-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
## Expected behavior

<!-- What you expected to happen -->

## Actual behavior

<!-- What actually happened -->

## What version are you using?

Version: <!--- Give us the version number here -->
Browser and version: <!--- If applicable give us the browser specs -->

## Steps to reproduce

<!--
1. First Step
2. Second Step
3. and so on...
-->

## Bug report checklist

- [ ] I have filled out as much of the above information as I can
- [ ] I have included a test case because my odds go _way_ up that the team can fix this when I do
- [ ] I have [searched for existing issues](https://github.com/540co/govicons/issues) and to the best of my knowledge this is not a duplicate
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/icon-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## What can it be used for?

<!--- describe how this could be used / the use case for this icon -->

## Example image (optional)

<!--- insert the example image here if necessary -->

## Icon request checklist

- [ ] The title starts with "Icon request: " and is followed by the requested icon name (Ex: `Icon request: hipster-coder`)
- [ ] I have [searched for existing issues](https://github.com/540co/govicons/issues) and to the best of my knowledge this is not a duplicate
- [ ] I have included at least one example image if it could be helpful (optional)
12 changes: 12 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!--- Provide a general summary of your changes in the Title above
Expand on it in the description below (if applicable) -->
<!-- Attach a screenshot where applicable -->

## Reference to issue
<!--- A reference to a related issue in the repository -->

## Description
<!--- Describe your changes -->

## Mentions
<!--- @mentions of the person or team responsible for reviewing proposed changes. -->
25 changes: 25 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Contributing to Gov Icons

If you have discovered a bug or have a feature suggestion, feel free to create an issue on Github.

## Quick start

We only accept issues that are icon requests, bug reports, or feature requests.
Bugs must be isolated and reproducible problems that we can fix within the Gov Icons framework.

* [Request a new icon](https://github.com/540co/govicons/issues/new?title=Icon%20request:%20icon-name&template=icon-request.md)
* [Submit a bug report](https://github.com/540co/govicons/issues/new?template=bug-report.md)

## Requesting new icons

- Title your new issue Icon request: icon-name (e.g., Icon request: icon-drone).
- Include a few use cases for your requested icon. How do you plan on using it?

## Key branches

- `master` is the latest, deployed version

## Pull requests

- At the moment we are not accepting pull requests containing icons
- Try to share which browsers your code has been tested in before submitting a pull request
3 changes: 3 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Gov Icons licensed under [SIL OFL 1.1](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL)
- Code licensed under [MIT License](http://opensource.org/licenses/mit-license.html)
- Documentation licensed under [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
## Gov Icons
<h1 align="center">
<img src=".assets/govicons-logo.svg" alt="Gov Icons Logo" height="200"/>
</h1>

*Version 1.4.0*
<p align="center">
<a href="https://badge.fury.io/js/govicons"><img src="https://badge.fury.io/js/govicons.svg" alt="npm version" height="18"></a> <a href="https://badge.fury.io/bo/govicons"><img src="https://badge.fury.io/bo/govicons.svg" alt="Bower version" height="18"></a>
</p>

**A Government font and CSS toolkit, inspired by [Font-Awesome](http://fontawesome.io)**.
<p align="center">A Government font and CSS toolkit, inspired by <a href="http://fontawesome.io">Font-Awesome</a>.</p>

---

Gov Icons is a icon font and CSS toolkit with 129 government themed icons, for easy scalable vector graphics on projects that needs government based icons. Gov Icons is created and maintained by [540](http://540.co).

Expand Down Expand Up @@ -37,13 +43,7 @@ Get started and learn how to use Gov Icons at <http://govicons.io>!
- Looking for older versions of Gov Icons? Check the [releases](https://github.com/540co/govicons/releases).

## Contributing

If you want to add icon ideas, icon art, or other fixes/changes to how the package works, feel free to submit an issue.

#### Requesting new icons

- Title your new issue Icon request: icon-name (e.g., Icon request: icon-vote).
- Include a few use cases for your requested icon. How do you plan on using it?
Please read through our [contributing guidelines](./CONTRIBUTING.md). Included are directions for opening issues.

## Licensing

Expand Down
5 changes: 3 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "govicons",
"description": "Govicons - Government font and CSS toolkit",
"version": "1.4.0",
"version": "1.4.1",
"keywords": [
"government",
"font",
Expand All @@ -26,6 +26,7 @@
"*.yml",
"Gemfile",
"Gemfile.lock",
"*.md"
"*.md",
"./assets"
]
}
2 changes: 1 addition & 1 deletion css/govicons.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Govicons v1.4.0 by @540co - https://github.com/540co/govicons - @540co
* Govicons v1.4.1 by @540co - https://github.com/540co/govicons - @540co
* License (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
Expand Down
2 changes: 1 addition & 1 deletion less/govicons.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Govicons v1.4.0 by @540co - https://github.com/540co/govicons - @540co
* Govicons v1.4.1 by @540co - https://github.com/540co/govicons - @540co
* License (Font: SIL OFL 1.1, CSS: MIT License)
*/

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "govicons",
"description": "Govicons - Government font and CSS toolkit",
"version": "1.4.0",
"version": "1.4.1",
"style": "css/govicons.css",
"keywords": ["gov", "icons", "Govicons", "icon", "font", "bootstrap"],
"homepage": "http://govicons.io/",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion scss/govicons.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Govicons v1.4.0 by @540co - https://github.com/540co/govicons - @540co
* Govicons v1.4.1 by @540co - https://github.com/540co/govicons - @540co
* License (Font: SIL OFL 1.1, CSS: MIT License)
*/

Expand Down

0 comments on commit 543cbc1

Please sign in to comment.