Merge pull request #276 from devicons/merge/build-integrate/master

Merge build-integrate with updated master

.github/ISSUE_TEMPLATE/icon-request.md

@@ -0,0 +1,15 @@
+---
+name: Icon request
+about: Requesting a new icon or changes to an existing icon
+title: 'Icon request: [NAME]'
+labels: 'request: icon'
+assignees: ''
+
+---
+
+### About the icon
+*Short description why you think this icon is matching in our project*
+### Links
+*Provide helpful links which can be used to take a deeper look into the icon and provide, if available, some resources (svg's) where the icon can be found*
+### Preview
+*If available, provide some images of the icon you would like to be added*

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+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, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+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.
+
+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.
+
+## Scope
+
+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.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a maintainer of the [project team members](https://github.com/orgs/devicons/people). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and 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.
+
+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.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

README.md

@@ -5,7 +5,7 @@
 Devicon aims to gather all logos representing development languages and tools.
 Each icon comes in several versions: font/svg, original/plain/line, colored/not colored, wordmark/no wordmark.
 
-Devicon it's 78 icons and 200+ versions. And it's growing!
+Devicon it's 80+ icons and 200+ versions. And it's growing!
 
 See all available icons on the [new website](https://devicons.github.io/devicon/).
 

devicon-alias.css

@@ -169,4 +169,11 @@
 
 .devicon-windows8-plain:before {
     content: "\ebf5";
+}
+
+.devicon-codepen-plain-wordmark:before {
+    content: "\e95d";
+}
+.devicon-codepen-original:before {
+    content: "\e95e";
 }

devicon-colors.css

@@ -1,3 +1,9 @@
+.devicon-codepen-original-wordmark.colored,
+.devicon-codepen-plain-wordmark.colored,
+.devicon-codepen-original.colored,
+.devicon-codepen-plain.colored {
+  color: #231F20;
+}
 .devicon-sketch-line-wordmark.colored,
 .devicon-sketch-line.colored {
   color: #fdad00;
@@ -24,6 +30,10 @@
 .devicon-yarn-plain.colored {
   color: #2c8ebb;
 }
+.devicon-haskell-plain-wordmark.colored,
+.devicon-haskell-plain.colored{
+  color: #5E5185;
+}
 .devicon-handlebars-plain-wordmark.colored,
 .devicon-handlebars-plain.colored{
   color: #000000;