From 0757cec0a8b35f5b37fc7d86eb776ad5ad210198 Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Sun, 11 Oct 2020 22:03:23 -0700 Subject: [PATCH] Add new_icons.png to gitignore. Fixed yunohost, clojure, clojurescript, and redux --- .github/scripts/build_assets/filehandler.py | 1 + .github/workflows/build_icons.yml | 2 +- .gitignore | 3 ++- CONTRIBUTING.md | 3 +-- devicon.json | 24 ++++++++++++++++----- gulpfile.js | 2 +- icons/yunohost/yunohost-plain.svg | 3 +++ 7 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 icons/yunohost/yunohost-plain.svg diff --git a/.github/scripts/build_assets/filehandler.py b/.github/scripts/build_assets/filehandler.py index 42c8cafa..6fc69920 100644 --- a/.github/scripts/build_assets/filehandler.py +++ b/.github/scripts/build_assets/filehandler.py @@ -68,6 +68,7 @@ def get_svgs_paths(new_icons: List[dict], icons_folder_path: str) -> List[str]: for font_version in icon_info["versions"]["font"]: # if it's an alias, we don't want to make it into an icon if is_alias(font_version, aliases): + print(f"Not exist {icon_info['name']}-{font_version}.svg") continue file_name = f"{icon_info['name']}-{font_version}.svg" diff --git a/.github/workflows/build_icons.yml b/.github/workflows/build_icons.yml index 91a03e04..393d6b5a 100644 --- a/.github/workflows/build_icons.yml +++ b/.github/workflows/build_icons.yml @@ -36,7 +36,7 @@ jobs: if: ${{success()}} with: name: new_icons - path: ./.github/scripts/new_icons.png + path: ./new_icons.png - name: Running npm task for building devicon.min.css if: ${{ success() }} run: npm run build-css diff --git a/.gitignore b/.gitignore index 3c5259ea..8d5f0229 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ node_modules .idea geckodriver.log __pycache__ -*.pyc \ No newline at end of file +*.pyc +new_icons.png \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b64b15b..a630e382 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -155,10 +155,9 @@ As an example, let's assume you have created the svgs for Amazon Web Services an "original-wordmark", "plain-wordmark" ], - "font": [ // here are the versions that are available as font icons + "font": [ // here are the versions that will be used to create icons "original", // original is simple enough to be used as plain "plain-wordmark", - "plain" // plain doesn't exist as an svg but it will be in the final font version ] }, "color": "#F7A80D", // note the '#' character diff --git a/devicon.json b/devicon.json index 99402d88..32475d6f 100644 --- a/devicon.json +++ b/devicon.json @@ -412,8 +412,11 @@ "original", "plain" ], - "font": [] + "font": [ + "plain" + ] }, + "color": "#96ca4b", "aliases": [] }, { @@ -2042,9 +2045,16 @@ "svg": [ "original" ], - "font": [] + "font": [ + "original" + ] }, - "aliases": [] + "aliases": [ + { + "base": "original", + "alias": "plain" + } + ] }, { "name": "ruby", @@ -2669,10 +2679,14 @@ ], "versions": { "svg": [ - "original" + "original", + "plain" ], - "font": [] + "font": [ + "plain" + ] }, + "color": "#ffffff", "aliases": [] }, { diff --git a/gulpfile.js b/gulpfile.js index 29fded8e..9adce05c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -100,7 +100,7 @@ function createColorsCSS(deviconJson) { versions: { font: fonts }, - color + color, } = fontObj; if (fonts.length === 0 || typeof(color) !== "string") { diff --git a/icons/yunohost/yunohost-plain.svg b/icons/yunohost/yunohost-plain.svg new file mode 100644 index 00000000..097ca2db --- /dev/null +++ b/icons/yunohost/yunohost-plain.svg @@ -0,0 +1,3 @@ + + +