Skip to content

Commit 709c5ef

Browse files
authored
Merge branch 'develop' into new-icon-kaldi
2 parents 3bdd491 + 6d8e331 commit 709c5ef

33 files changed

+281
-14
lines changed

.gitpod.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ tasks:
88
- name: Build CSS & run web server
99
init: npm run build-css && npm run dev
1010

11-
github:
12-
prebuilds:
13-
addBadge: true
14-
addComment: false
15-
addCheck: true
16-
master: true
17-
branches: true
18-
pullRequestsFromForks: true
19-
2011
ports:
2112
- port: 8000
2213
onOpen: open-preview

devicon.json

Lines changed: 250 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,28 @@
555555
}
556556
]
557557
},
558+
{
559+
"name": "apex",
560+
"altnames": [],
561+
"tags": [
562+
"language"
563+
],
564+
"versions": {
565+
"svg": [
566+
"original"
567+
],
568+
"font": [
569+
"original"
570+
]
571+
},
572+
"color": "#0d9dda",
573+
"aliases": [
574+
{
575+
"base": "original",
576+
"alias": "plain"
577+
}
578+
]
579+
},
558580
{
559581
"name": "apl",
560582
"altnames": [
@@ -2513,6 +2535,36 @@
25132535
"color": "#087cfa",
25142536
"aliases": []
25152537
},
2538+
{
2539+
"name": "datatables",
2540+
"altnames": [],
2541+
"tags": [
2542+
"css",
2543+
"framework",
2544+
"html",
2545+
"javascript",
2546+
"library"
2547+
],
2548+
"versions": {
2549+
"svg": [
2550+
"original"
2551+
],
2552+
"font": [
2553+
"original"
2554+
]
2555+
},
2556+
"color": "#ffffff",
2557+
"aliases": [
2558+
{
2559+
"base": "original",
2560+
"alias": "plain"
2561+
},
2562+
{
2563+
"base": "original",
2564+
"alias": "line"
2565+
}
2566+
]
2567+
},
25162568
{
25172569
"name": "dbeaver",
25182570
"altnames": [],
@@ -3542,11 +3594,11 @@
35423594
"base": "original",
35433595
"alias": "original-wordmark"
35443596
},
3545-
{
3597+
{
35463598
"base": "original",
35473599
"alias": "plain"
35483600
},
3549-
{
3601+
{
35503602
"base": "original",
35513603
"alias": "plain-wordmark"
35523604
}
@@ -4182,6 +4234,32 @@
41824234
"color": "#24292e",
41834235
"aliases": []
41844236
},
4237+
{
4238+
"name": "gitkraken",
4239+
"altnames": [],
4240+
"tags": [
4241+
"git",
4242+
"version-control"
4243+
],
4244+
"versions": {
4245+
"svg": [
4246+
"original",
4247+
"original-wordmark",
4248+
"plain-wordmark"
4249+
],
4250+
"font": [
4251+
"original",
4252+
"plain-wordmark"
4253+
]
4254+
},
4255+
"color": "#179287",
4256+
"aliases": [
4257+
{
4258+
"base": "original",
4259+
"alias": "plain"
4260+
}
4261+
]
4262+
},
41854263
{
41864264
"name": "gitlab",
41874265
"altnames": [],
@@ -4268,6 +4346,27 @@
42684346
"color": "#ffaff3",
42694347
"aliases": []
42704348
},
4349+
{
4350+
"name": "glitch",
4351+
"altnames": [],
4352+
"tags": [
4353+
"web-apps",
4354+
"online-platform",
4355+
"programming-environment",
4356+
"collaborative-environment"
4357+
],
4358+
"versions": {
4359+
"svg": [
4360+
"original",
4361+
"plain"
4362+
],
4363+
"font": [
4364+
"plain"
4365+
]
4366+
},
4367+
"color": "#000000",
4368+
"aliases": []
4369+
},
42714370
{
42724371
"name": "go",
42734372
"altnames": [
@@ -4899,6 +4998,26 @@
48994998
"color": "#fbb040",
49004999
"aliases": []
49015000
},
5001+
{
5002+
"name": "hoppscotch",
5003+
"altnames": [],
5004+
"tags": [
5005+
"rest",
5006+
"testing",
5007+
"api"
5008+
],
5009+
"versions": {
5010+
"svg": [
5011+
"original",
5012+
"plain"
5013+
],
5014+
"font": [
5015+
"plain"
5016+
]
5017+
},
5018+
"color": "#00d196",
5019+
"aliases": []
5020+
},
49025021
{
49035022
"name": "html5",
49045023
"altnames": [
@@ -5042,6 +5161,7 @@
50425161
],
50435162
"versions": {
50445163
"svg": [
5164+
"original",
50455165
"plain",
50465166
"line"
50475167
],
@@ -5050,7 +5170,7 @@
50505170
"line"
50515171
]
50525172
},
5053-
"color": "#faa625",
5173+
"color": "#330000",
50545174
"aliases": []
50555175
},
50565176
{
@@ -5438,6 +5558,33 @@
54385558
"color": "#4285f4",
54395559
"aliases": []
54405560
},
5561+
{
5562+
"name": "jhipster",
5563+
"altnames": [],
5564+
"tags": [
5565+
"development",
5566+
"framework",
5567+
"java",
5568+
"platform",
5569+
"web",
5570+
"web-application",
5571+
"web-development"
5572+
],
5573+
"versions": {
5574+
"svg": [
5575+
"original",
5576+
"original-wordmark",
5577+
"plain",
5578+
"plain-wordmark"
5579+
],
5580+
"font": [
5581+
"plain",
5582+
"plain-wordmark"
5583+
]
5584+
},
5585+
"color": "#4289c7",
5586+
"aliases": []
5587+
},
54415588
{
54425589
"name": "jira",
54435590
"altnames": [
@@ -7715,6 +7862,29 @@
77157862
"color": "#76d04b",
77167863
"aliases": []
77177864
},
7865+
{
7866+
"name": "nodered",
7867+
"altnames": [
7868+
"node-red"
7869+
],
7870+
"tags": [
7871+
"programming",
7872+
"tool"
7873+
],
7874+
"versions": {
7875+
"svg": [
7876+
"original",
7877+
"plain",
7878+
"line"
7879+
],
7880+
"font": [
7881+
"plain",
7882+
"line"
7883+
]
7884+
},
7885+
"color": "#8f0000",
7886+
"aliases": []
7887+
},
77187888
{
77197889
"name": "nodewebkit",
77207890
"altnames": [
@@ -9163,6 +9333,29 @@
91639333
"color": "#d51c2f",
91649334
"aliases": []
91659335
},
9336+
{
9337+
"name": "proxmox",
9338+
"altnames": [],
9339+
"tags": [
9340+
"container",
9341+
"lxc",
9342+
"virtual machine"
9343+
],
9344+
"versions": {
9345+
"svg": [
9346+
"original",
9347+
"original-wordmark",
9348+
"plain",
9349+
"plain-wordmark"
9350+
],
9351+
"font": [
9352+
"plain",
9353+
"plain-wordmark"
9354+
]
9355+
},
9356+
"color": "#e57000",
9357+
"aliases": []
9358+
},
91669359
{
91679360
"name": "pulsar",
91689361
"altnames": [
@@ -11312,6 +11505,35 @@
1131211505
"color": "#7d353b",
1131311506
"aliases": []
1131411507
},
11508+
{
11509+
"name": "styledcomponents",
11510+
"altnames": [
11511+
"Styled Components",
11512+
"styled-components"
11513+
],
11514+
"tags": [
11515+
"css",
11516+
"javascript",
11517+
"js",
11518+
"library",
11519+
"nodejs",
11520+
"web"
11521+
],
11522+
"versions": {
11523+
"svg": [
11524+
"original",
11525+
"original-wordmark",
11526+
"plain",
11527+
"plain-wordmark"
11528+
],
11529+
"font": [
11530+
"plain",
11531+
"plain-wordmark"
11532+
]
11533+
},
11534+
"color": "#d268a7",
11535+
"aliases": []
11536+
},
1131511537
{
1131611538
"name": "stylus",
1131711539
"altnames": [
@@ -13211,6 +13433,31 @@
1321113433
}
1321213434
]
1321313435
},
13436+
{
13437+
"name": "wolfram",
13438+
"altnames": [
13439+
"wolframlanguage"
13440+
],
13441+
"tags": [
13442+
"data-science",
13443+
"functional",
13444+
"programming"
13445+
],
13446+
"versions": {
13447+
"svg": [
13448+
"original",
13449+
"original-wordmark",
13450+
"plain",
13451+
"plain-wordmark"
13452+
],
13453+
"font": [
13454+
"plain",
13455+
"plain-wordmark"
13456+
]
13457+
},
13458+
"color": "#dd1100",
13459+
"aliases": []
13460+
},
1321413461
{
1321513462
"name": "woocommerce",
1321613463
"altnames": [],

icons/apex/apex-original.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)