Skip to content

Commit beb6ff2

Browse files
canalealcanaleal
authored
Merge branch 'develop' into develop
2 parents 10b414a + 79f33c8 commit beb6ff2

18 files changed

Lines changed: 160 additions & 98 deletions

‎devicon.json‎

Lines changed: 144 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@
8989
"color": "#c21417",
9090
"aliases": [
9191
{
92-
"base": "original",
93-
"alias": "plain"
92+
"base": "original",
93+
"alias": "plain"
9494
},
9595
{
96-
"base": "original-wordmark",
97-
"alias": "plain-wordmark"
96+
"base": "original-wordmark",
97+
"alias": "plain-wordmark"
9898
}
9999
]
100100
},
@@ -124,8 +124,8 @@
124124
"color": "#ee295f",
125125
"aliases": [
126126
{
127-
"base": "original-wordmark",
128-
"alias": "plain-wordmark"
127+
"base": "original-wordmark",
128+
"alias": "plain-wordmark"
129129
}
130130
]
131131
},
@@ -1863,50 +1863,50 @@
18631863
"aliases": []
18641864
},
18651865
{
1866-
"name": "clion",
1866+
"name": "clickhouse",
18671867
"altnames": [],
18681868
"tags": [
1869-
"jetbrains",
1870-
"editor",
1871-
"c",
1872-
"c++",
1873-
"cpp",
1874-
"cplusplus"
1869+
"cloud",
1870+
"column-oriented",
1871+
"database",
1872+
"warehouse"
18751873
],
18761874
"versions": {
18771875
"svg": [
18781876
"original",
1879-
"original-wordmark",
1880-
"plain",
1881-
"plain-wordmark"
1877+
"plain"
18821878
],
18831879
"font": [
1884-
"plain",
1885-
"plain-wordmark"
1880+
"plain"
18861881
]
18871882
},
1888-
"color": "#21d789",
1883+
"color": "#f9ff69",
18891884
"aliases": []
18901885
},
18911886
{
1892-
"name": "clickhouse",
1887+
"name": "clion",
18931888
"altnames": [],
18941889
"tags": [
1895-
"cloud",
1896-
"column-oriented",
1897-
"database",
1898-
"warehouse"
1890+
"jetbrains",
1891+
"editor",
1892+
"c",
1893+
"c++",
1894+
"cpp",
1895+
"cplusplus"
18991896
],
19001897
"versions": {
19011898
"svg": [
19021899
"original",
1903-
"plain"
1900+
"original-wordmark",
1901+
"plain",
1902+
"plain-wordmark"
19041903
],
19051904
"font": [
1906-
"plain"
1905+
"plain",
1906+
"plain-wordmark"
19071907
]
19081908
},
1909-
"color": "#f9ff69",
1909+
"color": "#21d789",
19101910
"aliases": []
19111911
},
19121912
{
@@ -3252,24 +3252,14 @@
32523252
"versions": {
32533253
"svg": [
32543254
"original",
3255-
"original-wordmark"
3255+
"plain"
32563256
],
32573257
"font": [
3258-
"original",
3259-
"original-wordmark"
3258+
"plain"
32603259
]
32613260
},
3262-
"color": "#ff6600",
3263-
"aliases": [
3264-
{
3265-
"base": "original",
3266-
"alias": "plain"
3267-
},
3268-
{
3269-
"base": "original-wordmark",
3270-
"alias": "plain-wordmark"
3271-
}
3272-
]
3261+
"color": "#ff6a13",
3262+
"aliases": []
32733263
},
32743264
{
32753265
"name": "dynamodb",
@@ -6829,6 +6819,36 @@
68296819
}
68306820
]
68316821
},
6822+
{
6823+
"name": "leetcode",
6824+
"altnames": [],
6825+
"tags": [
6826+
"online-platform",
6827+
"coding-platform",
6828+
"platform",
6829+
"coding",
6830+
"dsa",
6831+
"interview-preparation"
6832+
],
6833+
"versions": {
6834+
"svg": [
6835+
"original",
6836+
"plain",
6837+
"line",
6838+
"original-wordmark",
6839+
"plain-wordmark",
6840+
"line-wordmark"
6841+
],
6842+
"font": [
6843+
"plain",
6844+
"line",
6845+
"plain-wordmark",
6846+
"line-wordmark"
6847+
]
6848+
},
6849+
"color": "#ffa116",
6850+
"aliases": []
6851+
},
68326852
{
68336853
"name": "less",
68346854
"altnames": [
@@ -7017,10 +7037,12 @@
70177037
"versions": {
70187038
"svg": [
70197039
"original",
7020-
"plain"
7040+
"plain",
7041+
"line"
70217042
],
70227043
"font": [
7023-
"plain"
7044+
"plain",
7045+
"line"
70247046
]
70257047
},
70267048
"color": "#5A90B6",
@@ -7067,7 +7089,7 @@
70677089
"color": "#fec514",
70687090
"aliases": []
70697091
},
7070-
{
7092+
{
70717093
"name": "love2d",
70727094
"altnames": [
70737095
"löve"
@@ -7989,6 +8011,57 @@
79898011
}
79908012
]
79918013
},
8014+
{
8015+
"name": "netbeans",
8016+
"altnames": [],
8017+
"tags": [
8018+
"ide",
8019+
"java",
8020+
"open-source"
8021+
],
8022+
"versions": {
8023+
"svg": [
8024+
"original",
8025+
"original-wordmark",
8026+
"plain",
8027+
"plain-wordmark"
8028+
],
8029+
"font": [
8030+
"plain",
8031+
"plain-wordmark"
8032+
]
8033+
},
8034+
"color": "#1e6abf",
8035+
"aliases": []
8036+
},
8037+
{
8038+
"name": "netbox",
8039+
"altnames": [],
8040+
"tags": [
8041+
"network",
8042+
"automation",
8043+
"infrastructure",
8044+
"open-source"
8045+
],
8046+
"versions": {
8047+
"svg": [
8048+
"original",
8049+
"original-wordmark",
8050+
"plain",
8051+
"plain-wordmark",
8052+
"line",
8053+
"line-wordmark"
8054+
],
8055+
"font": [
8056+
"plain",
8057+
"plain-wordmark",
8058+
"line",
8059+
"line-wordmark"
8060+
]
8061+
},
8062+
"color": "#00857d",
8063+
"aliases": []
8064+
},
79928065
{
79938066
"name": "netlify",
79948067
"altnames": [],
@@ -8105,29 +8178,6 @@
81058178
}
81068179
]
81078180
},
8108-
{
8109-
"name": "netbeans",
8110-
"altnames": [],
8111-
"tags": [
8112-
"ide",
8113-
"java",
8114-
"open-source"
8115-
],
8116-
"versions": {
8117-
"svg": [
8118-
"original",
8119-
"original-wordmark",
8120-
"plain",
8121-
"plain-wordmark"
8122-
],
8123-
"font": [
8124-
"plain",
8125-
"plain-wordmark"
8126-
]
8127-
},
8128-
"color": "#1e6abf",
8129-
"aliases": []
8130-
},
81318181
{
81328182
"name": "nginx",
81338183
"altnames": [],
@@ -8370,7 +8420,7 @@
83708420
{
83718421
"name": "nodered",
83728422
"altnames": [
8373-
"node-red"
8423+
"node-red"
83748424
],
83758425
"tags": [
83768426
"programming",
@@ -9777,8 +9827,7 @@
97779827
"php",
97789828
"framework"
97799829
],
9780-
"versions":
9781-
{
9830+
"versions": {
97829831
"svg": [
97839832
"original",
97849833
"original-wordmark",
@@ -10590,27 +10639,6 @@
1059010639
}
1059110640
]
1059210641
},
10593-
{
10594-
"name": "reactnative",
10595-
"altnames": [
10596-
"react-native"
10597-
],
10598-
"tags": [
10599-
"framework"
10600-
],
10601-
"versions": {
10602-
"svg": [
10603-
"original",
10604-
"original-wordmark"
10605-
],
10606-
"font": [
10607-
"original",
10608-
"original-wordmark"
10609-
]
10610-
},
10611-
"color": "#61dafb",
10612-
"aliases": []
10613-
},
1061410642
{
1061510643
"name": "reactbootstrap",
1061610644
"altnames": [
@@ -10640,6 +10668,27 @@
1064010668
}
1064110669
]
1064210670
},
10671+
{
10672+
"name": "reactnative",
10673+
"altnames": [
10674+
"react-native"
10675+
],
10676+
"tags": [
10677+
"framework"
10678+
],
10679+
"versions": {
10680+
"svg": [
10681+
"original",
10682+
"original-wordmark"
10683+
],
10684+
"font": [
10685+
"original",
10686+
"original-wordmark"
10687+
]
10688+
},
10689+
"color": "#61dafb",
10690+
"aliases": []
10691+
},
1064310692
{
1064410693
"name": "reactnavigation",
1064510694
"altnames": [],
@@ -14149,7 +14198,7 @@
1414914198
"aliases": []
1415014199
},
1415114200
{
14152-
"name": "windows8",
14201+
"name": "windows11",
1415314202
"altnames": [],
1415414203
"tags": [
1415514204
"os"
@@ -14164,7 +14213,7 @@
1416414213
"original-wordmark"
1416514214
]
1416614215
},
14167-
"color": "#00adef",
14216+
"color": "#0078d4",
1416814217
"aliases": [
1416914218
{
1417014219
"base": "original",
@@ -14177,7 +14226,7 @@
1417714226
]
1417814227
},
1417914228
{
14180-
"name": "windows11",
14229+
"name": "windows8",
1418114230
"altnames": [],
1418214231
"tags": [
1418314232
"os"
@@ -14192,7 +14241,7 @@
1419214241
"original-wordmark"
1419314242
]
1419414243
},
14195-
"color": "#0078d4",
14244+
"color": "#00adef",
1419614245
"aliases": [
1419714246
{
1419814247
"base": "original",

‎icons/dyalog/dyalog-original-wordmark.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎icons/dyalog/dyalog-original.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎icons/dyalog/dyalog-plain.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)