8000 merge master < develop by amacado · Pull Request #503 · devicons/devicon · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

merge master < develop #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2021
Merged

merge master < develop #503

merged 4 commits into from
Feb 21, 2021

Conversation

amacado
Copy link
Member
@amacado amacado commented Feb 21, 2021

Somehow our develop branch was 3 commits behind the master branch. I merged them to fix this. This probably explains also the weird bot messages in #498 and #499.

image

amacado and others added 4 commits January 4, 2021 00:58
Co-authored-by: Enis Mulić <enis.s.mulic@gmail.com>
* Create eleventy-original.svg

* Create eleventy-plain.svg

* Update devicon.json

* Update eleventy-plain.svg

* Update eleventy-original.svg

* new icon: sqlalchemy (plain, original, original-workmark)

* Add font aliase for sqlalchemy

* new icon: microsoftsqlserver (plain, plain-wordmark) (#427)

* new icon sqlserver (plain, plain-woodmark)

* Update icons/sqlserver/sqlserver-plain-wordmark.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update icons/sqlserver/sqlserver-plain.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update devicon.json

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update devicon.json

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Rename sqlserver icons to microsoftsqlserver

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* new icon: kubernetes (plain, plain-wordmark) (#424)

* new icon: kubernetes (plain, plain-wordmark)

* Update icons/kubernetes/kubernetes-plain.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update icons/kubernetes/kubernetes-plain-wordmark.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* new icon: rocksdb (plain) (#423)

* new icon: rocksdb (plain)

* Update icons/rocksdb/rocksdb-plain.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* new icon: googlecloud (original, original-wordmark, plain, plain-wordmark) (#428)

* new icon: googlecloud (plain, plain-wordmark, original, original-wordmark)

* Update icons/googlecloud/googlecloud-plain.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update icons/googlecloud/googlecloud-original-wordmark.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update icons/googlecloud/googlecloud-original.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Fix google cloud icons

* Fix googlecloud original

* Remove fill redefinition from google cloud original

* Fix googlecloud alignment (Test)

* Fix googlecloud alignment (test)

* Fix googlecloud alignment (test)

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* new icon: objectivec (plain) (#425)

* new icon: objectivec (plain)

* Update icons/objectivec/objectivec-plai
8000
n.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* new icon uwsgi (original, plain)

* Cleanup uwsgi icons

* Update devicon.json

Co-authored-by: Thomas Bui <43018778+Thomas-Boi@users.noreply.github.com>

* Add adobe XD line icon

* Add xd-plain and eps file

* Clean up xd svg file

* Update devicon.json

* new icon: firebase (plain, plain-wordmark) (#461)

* add icon Firebase (plain, plain-wordmark), Closes #204

* new icon: firebase (plain, plain-wordmark)

* update icons

* Add plain-wordmark to firebase fonts

* new icon: flask (original, original-wordmark) (#463)

* Cleanup flask icon

* Improve flask icons

* Update icons/flask/flask-original-wordmark.svg

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

Co-authored-by: moghya <sawantshubham571@gmail.com>
Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update devicon.json

* Fixed an error with devicon.json

* Added check script for the icons and fix icons with fill or viewBox issues (#460)

* Added script to check svg fill and viewBox

* Fix cucumber-plain-wordmark

* Fix various fill and viewBox issues in svgs

* Added check for height and width attr

* Added check_svgs workflow

* Fix an issue where the error is not log properly

* Added on push for testing

* Updated trigger so it now runs whenever PR is update

* Added sleep to script to make logs nicer

* Added script that create env var

* Updated the github_env to accomodate ubuntu

* Change format of log and allow filehandler to return Path

* Updated logging messages

* Updated refs for the checkout action

* Make logging nicer

* Updated fix messaging so it's more clear

* fix icons: icons/cucumber/cucumber-plain-wordmark.svg, icons/intellij/intellij-plain-wordmark.svg, icons/jenkins/jenkins-plain.svg, icons/twitter/twitter-original.svg, icons/yunohost/yunohost-plain.svg

* Fix the ref issue of the checkout action and sqlalchemy  (#472)

* Remove head_ref from checkout action

* Fixed the svg errs in sqlalchemy

* Create a monthly script that checks all svgs

* Python now print traceback

* Updated file names in check_svgs_on_pr

* Remove deprecated and unused svg syntax

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Remove deprecated and unused svg syntax

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update svg fill, remove unused class

* Change comment action to a new action

* Add guideline about squash merging

As the result of discussion #470 update guidelines with squash merging

* Redo the workflow archs so we can comment on pr

* Moved check_svgs_monthly to draft

* Added working workflow file

* Changed to file read action

* new icon: appwrite (plain, original, wordmark) (#371)

* Added Appwrite icon

* Fixed wrong JSON input

* Fixed JSON style

* Fixed indent

* Update devicon.json

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update devicon.json

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* Update devicon.json

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>

* bot:build new icons, icomoon.json and devicon.css (#486)

* fix bash-plain (#451) (#453)

Co-authored-by: Enis Mulić <enis.s.mulic@gmail.com>

* Built new icons, icomoon.json and devicon.css

Co-authored-by: Clemens Bastian <8781699+amacado@users.noreply.github.com>
Co-authored-by: Enis Mulić <enis.s.mulic@gmail.com>
Co-authored-by: amacado <amacado@users.noreply.github.com>

* Removed 'default fall back icon' from build_icons.yml

Co-authored-by: Tylen St Hilaire <28753109+tylensthilaire@users.noreply.github.com>
Co-authored-by: Enis Mulić <enis.s.mulic@gmail.com>
Co-authored-by: Thomas Bui <43018778+Thomas-Boi@users.noreply.github.com>
Co-authored-by: Withee Poositasai <witheep@gmail.com>
Co-authored-by: moghya <sawantshubham571@gmail.com>
Co-authored-by: Thomas Bui <thomasbui198@gmail.com>
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: amacado <amacado@users.noreply.github.com>
# Conflicts:
#	CONTRIBUTING.md
#	devicon.json
@amacado amacado added the bug Use this label for pointing out bugs label Feb 21, 2021
@github-actions
Copy link
Contributor

Hi!

I'm Devicons' SVG-Checker Bot and it seems we have some issues with your SVGs.

Here is what went wrong:

bash-plain.svg:
-deprecated 'enable-background' in style attribute -> Remove it
-unneccessary 'x' attribute in svg element -> Remove it
-unneccessary 'y' attribute in svg element -> Remove it

devicon.svg:
-'viewBox' is not '0 0 128 128' -> Set it or scale the file using https://www.iloveimg.com/resize-image/resize-svg

For more reference on why these are errors, check out our CONTRIBUTING guide

Please address these issues. When you update this PR, I will check your SVGs again.

Thanks for your help,
SVG-Checker Bot 😄

PS. One day, I will be smart enough to fix these errors for you 😣. Until then, I can only point them out.

@amacado amacado merged commit b627c57 into develop Feb 21, 2021
@amacado amacado deleted the amacado/merge/develop-master branch February 21, 2021 22:30
GCHQDeveloper926 pushed a commit to GCHQDeveloper926/devicon that referenced this pull request Dec 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Use this label for pointing out bugs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant
0