From 5ecb7334fd418f9937cff1895766413b7c33f710 Mon Sep 17 00:00:00 2001 From: Jonas Date: Sun, 13 Oct 2019 00:09:54 +0200 Subject: [PATCH 1/7] add clojure, clojurescript and yunohost to devicon.json --- devicon.json | 62 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/devicon.json b/devicon.json index dd691c63..9f6b5c6e 100644 --- a/devicon.json +++ b/devicon.json @@ -135,6 +135,22 @@ "font": ["plain", "plain-wordmark"] } }, + { + "name": "clojure", + "tags": ["language"], + "versions": { + "svg": ["original", "line", "plain"], + "font": [] + } + }, + { + "name": "clojurescript", + "tags": ["language"], + "versions": { + "svg": ["original", "plain"], + "font": [] + } + }, { "name": "codeigniter", "tags": ["php", "framework"], @@ -471,14 +487,6 @@ "font": ["original", "original-wordmark"] } }, - { - "name": "java", - "tags": ["programming", "language"], - "versions": { - "svg": ["original", "original-wordmark", "plain", "plain-wordmark"], - "font": ["plain", "plain-wordmark"] - } - }, { "name": "jasmine", "tags": ["testing"], @@ -487,6 +495,14 @@ "font": ["plain", "plain-wordmark"] } }, + { + "name": "java", + "tags": ["programming", "language"], + "versions": { + "svg": ["original", "original-wordmark", "plain", "plain-wordmark"], + "font": ["plain", "plain-wordmark"] + } + }, { "name": "javascript", "tags": ["programming", "language"], @@ -663,14 +679,6 @@ "font": ["plain", "plain-wordmark"] } }, - { - "name": "protractor", - "tags": ["framework", "javascript"], - "versions": { - "svg": ["plain", "plain-wordmark"], - "font": ["plain", "plain-wordmark"] - } - }, { "name": "postgresql", "tags": ["database"], @@ -680,10 +688,10 @@ } }, { - "name": "python", - "tags": ["programming", "language"], + "name": "protractor", + "tags": ["framework", "javascript"], "versions": { - "svg": ["original", "original-wordmark", "plain", "plain-wordmark"], + "svg": ["plain", "plain-wordmark"], "font": ["plain", "plain-wordmark"] } }, @@ -695,6 +703,14 @@ "font": ["plain", "plain-wordmark"] } }, + { + "name": "python", + "tags": ["programming", "language"], + "versions": { + "svg": ["original", "original-wordmark", "plain", "plain-wordmark"], + "font": ["plain", "plain-wordmark"] + } + }, { "name": "rails", "tags": ["framework"], @@ -951,6 +967,14 @@ "font": ["plain", "plain-wordmark"] } }, + { + "name": "yunohost", + "tags": ["os"], + "versions": { + "svg": ["original"], + "font": [] + } + }, { "name": "zend", "tags": ["php", "framework"], From 72d7b0884b646c4eef03b722dbb89b085ef2bfc4 Mon Sep 17 00:00:00 2001 From: Clemens Bastian <8781699+amacado@users.noreply.github.com> Date: Mon, 8 Jun 2020 22:33:06 +0200 Subject: [PATCH 2/7] draft contribution guidelines for submitting and requesting icons --- CONTRIBUTING.md | 74 ++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a8c0ef9..64767800 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,30 +1,48 @@ -# Contributing to Devicon - -First of all, thanks for taking the time to contribute! - -These are not rules, just guidelines that you can follow in order to keep the repository as clean as possible. But if you don't have time to follow all of it, no worries, just create a pull request and I'll make the modifications myself if needed. - -And if you think there is a better way to organize this repo, please do not hesitate to share your point of view. - -## Submitting icon(s) - -Each icon comes in different "versions": -- original -- original-wordmark -- plain -- plain-wordmark -- line -- line-wordmark - -This is not mandatory, an icon can only have 1 or 2 versions available. Just keep in mind that the minimum is 1 and the maximum 6 (for now). - -The plain and line versions (with or without wordmark) are designed to be available in the final icon font. So they need to stay as simple as possible (one color and ensure that the paths are united before to export to svg). You can use a service like [compressor](https://compressor.io/) or [SVG Editor](https://petercollingridge.appspot.com/svg-editor) in order to optimize the svg file. +

Contributing to Devicon

+

+First of all, thanks for taking the time to contribute! This project can only grow and live by your countless contributions. To keep this project maintable we developed some guidelines for contributions. +

+

Submitting icon

+ +

Icon formats and naming conventions

+

Each icon comes in different variantions:

+ +

+This is not mandatory, an icon can only have one or two variations available. Just keep in mind that the minimum is 1 and the maximum 6 (for now). +

+

+The plain and line variations (with or without wordmark) are designed to be available in the final icon font. So they need to stay as simple as possible (one color and ensure that the paths are united before to export to svg). You can use a service like compressor or SVG Editor in order to optimize the svg file. +

+

The original versions are only available in svg format, so they do not need to be as simple and they can contain numerous colors. +

+

Some icons are really simple (like the apple one), so the original version can be used for the icon font. In this case, I'll add an alias so they can be found with the "original" or "plain" naming convention. - -##### Organizational guidelines: -- Each icon has his own folder located in the "icons" folder. -- Each icon folder contains one .eps file and as many .svg files as versions available. -- The .eps file contains all available versions of an icon. Each version is contained in a 128px by 128px artboard. -- Each .svg file contains one version of an icon in a "0 0 128 128" viewbox -- The naming convention for the svg file is the following: (icon name)-(original/plain/line)-(wordmark) +

+

Organizational guidelines

+ +

Requesting a icon

+

When you want to request a new icon please feel free to create a issue following some simple guidelines:

+ From 3232d3f0fe352c43526f4428a366a4441a31d918 Mon Sep 17 00:00:00 2001 From: Clemens Bastian <8781699+amacado@users.noreply.github.com> Date: Mon, 8 Jun 2020 22:36:10 +0200 Subject: [PATCH 3/7] modify contribution guidelines for icon requests --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6423fef1..a651587f 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ Devicon it's 78 icons and 200+ versions. And it's growing! See all available icons on the [new website](https://konpa.github.io/devicon/). ## Icon requests - -**Please leave a comment [here](https://github.com/konpa/devicon/issues/11) in order to request an icon.** +When you want to request a icon please feel feel to create a issue. See our [contribution guidelines](https://github.com/konpa/devicon/blob/master/CONTRIBUTING.md) for more information. ## How to use From 9e2ece36868e1d1d0a62ad09fd77a89e384e4e81 Mon Sep 17 00:00:00 2001 From: Clemens Bastian <8781699+amacado@users.noreply.github.com> Date: Mon, 8 Jun 2020 22:50:45 +0200 Subject: [PATCH 4/7] fix typo Co-authored-by: Maximilian Berkmann --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64767800..d79de61b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ First of all, thanks for taking the time to contribute! This project can only gr
  • optional: Reference the issues regarding the new icon

    • Icon formats and naming conventions

    -

    Each icon comes in different variantions:

    +

    Each icon comes in different variations:

    From f741fcabd82f2c4f550883017d5bcf6a5b744de4 Mon Sep 17 00:00:00 2001 From: amacado Date: Wed, 10 Jun 2020 22:45:52 +0200 Subject: [PATCH 7/7] upgrade gulp v3 to v4 and migrate gulp tasks; documentation about the build process --- README.md | 24 ++++++++++++++++++++++++ gulpfile.js | 4 ++-- package.json | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6423fef1..e39b0fc7 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,27 @@ Please have a look at the [CONTRIBUTING.md](https://github.com/konpa/devicon/blo Under [MIT Licence](https://github.com/konpa/devicon/blob/master/LICENSE) All product names, logos, and brands are property of their respective owners. All company, product and service names used in this website are for identification purposes only. Use of these names, logos, and brands does not imply endorsement. + +## Go build yourself +### Prerequisites +Install gulp (and gulp plugins) +```bash +npm install +``` +### Build the font and export stylesheet +Open [icomoon app](https://icomoon.io/app/#/select) and import [icomoon.json](icomoon.json). Choose _yes_ when beeing asked +if you like to restore the settings stored in the configuration file. + +The next step is to click on **Generate font** and download the resulting archive. Extract it +contents and you will find a [fonts](./fonts) directory next to a `style.css`. Replace the content of the `fonts` folder, +merge the `style.css` with [devicon.css](./devicon.css) and follow the next step to build the final stylesheet. + +**Note** the merge is required, because some icons are defined as alias, this should be replaced +with a more elegant solution to support automated build processing. + +### Build and minify stylesheet +Run the following commands to build the resulting file `devicon.min.css` +```bash +gulp concat-css +gulp minify-css +``` diff --git a/gulpfile.js b/gulpfile.js index 34e71d6e..da3a667b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,14 +4,14 @@ var concatCss = require('gulp-concat-css'); var plumber = require('gulp-plumber'); gulp.task('concat-css', function () { - gulp.src(['./devicon.css', './devicon-colors.css']) + return gulp.src(['./devicon.css', './devicon-colors.css']) .pipe(plumber()) .pipe(concatCss('./devicon.min.css')) .pipe(gulp.dest('./')); }); gulp.task('minify-css', function() { - gulp.src('./devicon.min.css') + return gulp.src('./devicon.min.css') .pipe(plumber()) .pipe(minifyCSS()) .pipe(gulp.dest('./')) diff --git a/package.json b/package.json index 14fd76c9..df78aec7 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "homepage": "http://konpa.github.io/devicon/", "devDependencies": { - "gulp": "^3.8.10", + "gulp": "^4.0.0", "gulp-concat-css": "^2.0.0", "gulp-minify-css": "^0.4.3", "gulp-plumber": "^0.6.6"