aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-28 14:56:26 +0200
committerChocobozzz <me@florianbigard.com>2021-05-28 14:56:42 +0200
commit5351a0584f528e4ddb9c3c99329ba88e0ca8288e (patch)
treeebebba8b09aa536337bb645775296abe9e7c2690
parent0fc9843215038f4bfae60f7b68c0dc231dc27570 (diff)
downloadPeerTube-5351a0584f528e4ddb9c3c99329ba88e0ca8288e.tar.gz
PeerTube-5351a0584f528e4ddb9c3c99329ba88e0ca8288e.tar.zst
PeerTube-5351a0584f528e4ddb9c3c99329ba88e0ca8288e.zip
Replace local menu icon
-rw-r--r--CREDITS.md18
-rw-r--r--client/angular.json2
-rw-r--r--client/src/app/core/menu/menu.service.ts2
-rw-r--r--client/src/app/shared/shared-icons/global-icon.component.ts2
-rw-r--r--client/src/assets/images/feather/octagon.svg3
-rw-r--r--client/src/assets/images/misc/local.svg3
-rw-r--r--client/src/sass/include/_mixins.scss3
-rwxr-xr-xscripts/generate-code-contributors.ts1
8 files changed, 20 insertions, 14 deletions
diff --git a/CREDITS.md b/CREDITS.md
index a54cfe5f3..6cc369482 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -8,8 +8,8 @@
8 * Simon Brosdetzko 8 * Simon Brosdetzko
9 * Александр 9 * Александр
10 * Berto Te 10 * Berto Te
11 * Clemens Schielicke
12 * Jeff Huang 11 * Jeff Huang
12 * Clemens Schielicke
13 * kontrollanten 13 * kontrollanten
14 * Laurent Ettouati 14 * Laurent Ettouati
15 * Racida S 15 * Racida S
@@ -24,23 +24,23 @@
24 * GunChleoc 24 * GunChleoc
25 * Slimane Selyan AMIRI 25 * Slimane Selyan AMIRI
26 * Zet 26 * Zet
27 * x
28 * Frank Sträter 27 * Frank Sträter
28 * x
29 * Julien Maulny 29 * Julien Maulny
30 * Kimsible
30 * Mark Van den Borre 31 * Mark Van den Borre
32 * John Livingston
31 * Jorropo 33 * Jorropo
32 * Josh Morel 34 * Josh Morel
33 * BO41 35 * BO41
34 * Balázs Meskó 36 * Balázs Meskó
37 * Eivind Ødegård
35 * Francesc 38 * Francesc
36 * John Livingston
37 * mando laress 39 * mando laress
38 * Eivind Ødegård
39 * Quentin PAGÈS 40 * Quentin PAGÈS
40 * Besnik Bleta 41 * Besnik Bleta
41 * Ihor Hordiichuk 42 * Ihor Hordiichuk
42 * ButterflyOfFire 43 * ButterflyOfFire
43 * Kimsible
44 * Xabi 44 * Xabi
45 * buoyantair 45 * buoyantair
46 * Balázs Úr 46 * Balázs Úr
@@ -85,6 +85,7 @@
85 * Frank Chang 85 * Frank Chang
86 * Green-Star 86 * Green-Star
87 * Micah Elizabeth Scott 87 * Micah Elizabeth Scott
88 * Poslovitch
88 * SVNET Libre 89 * SVNET Libre
89 * Thomas Kuntz 90 * Thomas Kuntz
90 * William Lahti 91 * William Lahti
@@ -104,7 +105,6 @@
104 * Mildred 105 * Mildred
105 * Okhin 106 * Okhin
106 * Pierre-Alain TORET 107 * Pierre-Alain TORET
107 * Poslovitch
108 * Serge Victor 108 * Serge Victor
109 * Théo Le Calvar 109 * Théo Le Calvar
110 * Ugaitz 110 * Ugaitz
@@ -125,9 +125,11 @@
125 * Daniele Garau 125 * Daniele Garau
126 * Dep Pranata 126 * Dep Pranata
127 * Ehsan Gholami 127 * Ehsan Gholami
128 * Eric Guichaoua
128 * Girish Ramakrishnan 129 * Girish Ramakrishnan
129 * Hakim Oubouali 130 * Hakim Oubouali
130 * Hans Meiser 131 * Hans Meiser
132 * Hồ Nhất Duy
131 * Iñigo A 133 * Iñigo A
132 * Jefferson Hernandez 134 * Jefferson Hernandez
133 * Joan Montané 135 * Joan Montané
@@ -166,7 +168,6 @@
166 * Diazepan Medina 168 * Diazepan Medina
167 * Dirk Kelly 169 * Dirk Kelly
168 * EndoGai 170 * EndoGai
169 * Eric Guichaoua
170 * Florent Fayolle 171 * Florent Fayolle
171 * Florian 172 * Florian
172 * Frank de Lange 173 * Frank de Lange
@@ -189,6 +190,7 @@
189 * Quentin 190 * Quentin
190 * Ronan 191 * Ronan
191 * SerCom_KC 192 * SerCom_KC
193 * Stakovicz
192 * Thai Localization 194 * Thai Localization
193 * Valvin 195 * Valvin
194 * YiDai 196 * YiDai
@@ -384,6 +386,7 @@
384 * norrist 386 * norrist
385 * osauzet 387 * osauzet
386 * philippe lhardy 388 * philippe lhardy
389 * plr20
387 * potedeo 390 * potedeo
388 * sanchis 391 * sanchis
389 * spf 392 * spf
@@ -529,6 +532,7 @@
529 * `video-language` by Rigel Kent (CC-BY) 532 * `video-language` by Rigel Kent (CC-BY)
530 * `peertube-x` by Solen DP (CC-BY) 533 * `peertube-x` by Solen DP (CC-BY)
531 * `flame` by Freepik (Flaticon License) 534 * `flame` by Freepik (Flaticon License)
535 * `local` by Larea (CC-BY)
532 536
533 537
534# Contributors to our 2020 crowdfunding :heart: 538# Contributors to our 2020 crowdfunding :heart:
diff --git a/client/angular.json b/client/angular.json
index dc50bf709..39fe7aa51 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -160,7 +160,7 @@
160 "debug", 160 "debug",
161 "p2p-media-loader-hlsjs", 161 "p2p-media-loader-hlsjs",
162 "video.js", 162 "video.js",
163 "sha1", 163 "sha.js/sha1",
164 "postcss", 164 "postcss",
165 "core-js/features/reflect" 165 "core-js/features/reflect"
166 ], 166 ],
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts
index 77592cbb6..4e00d0bce 100644
--- a/client/src/app/core/menu/menu.service.ts
+++ b/client/src/app/core/menu/menu.service.ts
@@ -83,7 +83,7 @@ export class MenuService {
83 priority: 130 83 priority: 130
84 }, 84 },
85 { 85 {
86 icon: 'octagon' as 'octagon', 86 icon: 'local' as 'local',
87 label: $localize`Local videos`, 87 label: $localize`Local videos`,
88 menuLabel: $localize`Local videos`, 88 menuLabel: $localize`Local videos`,
89 path: '/videos/local', 89 path: '/videos/local',
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index a4dd72db6..a47f07fc3 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -17,6 +17,7 @@ const icons = {
17 'follower': require('!!raw-loader?!../../../assets/images/misc/account-arrow-left.svg').default, // material ui 17 'follower': require('!!raw-loader?!../../../assets/images/misc/account-arrow-left.svg').default, // material ui
18 'following': require('!!raw-loader?!../../../assets/images/misc/account-arrow-right.svg').default, // material ui 18 'following': require('!!raw-loader?!../../../assets/images/misc/account-arrow-right.svg').default, // material ui
19 'flame': require('!!raw-loader?!../../../assets/images/misc/flame.svg').default, 19 'flame': require('!!raw-loader?!../../../assets/images/misc/flame.svg').default,
20 'local': require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
20 21
21 // feather icons 22 // feather icons
22 'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default, 23 'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
@@ -72,7 +73,6 @@ const icons = {
72 'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default, 73 'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default,
73 'message-circle': require('!!raw-loader?!../../../assets/images/feather/message-circle.svg').default, 74 'message-circle': require('!!raw-loader?!../../../assets/images/feather/message-circle.svg').default,
74 'codesandbox': require('!!raw-loader?!../../../assets/images/feather/codesandbox.svg').default, 75 'codesandbox': require('!!raw-loader?!../../../assets/images/feather/codesandbox.svg').default,
75 'octagon': require('!!raw-loader?!../../../assets/images/feather/octagon.svg').default,
76 'award': require('!!raw-loader?!../../../assets/images/feather/award.svg').default 76 'award': require('!!raw-loader?!../../../assets/images/feather/award.svg').default
77} 77}
78 78
diff --git a/client/src/assets/images/feather/octagon.svg b/client/src/assets/images/feather/octagon.svg
deleted file mode 100644
index 1ed9bacbf..000000000
--- a/client/src/assets/images/feather/octagon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
1<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-octagon">
2 <polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon>
3</svg>
diff --git a/client/src/assets/images/misc/local.svg b/client/src/assets/images/misc/local.svg
new file mode 100644
index 000000000..99012b98a
--- /dev/null
+++ b/client/src/assets/images/misc/local.svg
@@ -0,0 +1,3 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.4666667 8.4666667" x="0px" y="0px" class="misc">
2 <path fill="currentColor" d="m 4.2330754,3.0330699e-4 c -1.9062912,0 -3.45664101,1.55086299301 -3.45663572,3.45715399301 0,1.041342 0.84545222,2.220339 1.65622812,3.201355 0.8107786,0.981014 1.6190225,1.736328 1.6190225,1.736328 a 0.26460984,0.26460984 0 0 0 0.3612197,0 c 0,0 0.8082439,-0.755314 1.6190224,-1.736328 0.810776,-0.981016 1.6582946,-2.160013 1.6582946,-3.201355 0,-1.906291 -1.5508605,-3.45715399301 -3.4571516,-3.45715399301 z m 0,0.52968500301 c 1.6203083,0 2.9279876,1.30716399 2.9279849,2.92746899 0,0.721961 -0.7497154,1.914917 -1.5353056,2.865459 -0.6952271,0.8412 -1.2416102,1.3482 -1.3926793,1.491898 C 4.0825513,7.6716453 3.5360226,7.1646033 2.840396,6.3229163 2.0548058,5.3723743 1.3035373,4.1794183 1.3035373,3.4574573 1.3035347,1.8371523 2.6127671,0.52998831 4.2330754,0.52998831 Z m 0.00878,0.91518899 a 0.26460979,0.26460979 0 0 0 -0.026355,5.16e-4 0.26460979,0.26460979 0 0 0 -0.1405599,0.05116 L 2.444037,2.6998813 a 0.26474432,0.26474432 0 1 0 0.3147086,0.425813 l 0.056327,-0.04134 v 1.224733 a 0.26460979,0.26460979 0 0 0 0.2640673,0.265615 h 2.30632 a 0.26460979,0.26460979 0 0 0 0.2656152,-0.265615 v -1.223698 l 0.054777,0.04031 A 0.2647471,0.2647471 0 1 0 6.0205633,2.6998813 L 5.5513406,2.3536473 a 0.26460979,0.26460979 0 0 0 -0.00775,-0.0057 L 4.3896558,1.4968523 a 0.26460979,0.26460979 0 0 0 -0.1477963,-0.05168 z m -0.00878,0.594278 0.8888333,0.655775 v 0.217556 1.132747 H 4.4971428 v -0.437697 a 0.26460984,0.26460984 0 0 0 -0.2676843,-0.267684 0.26460984,0.26460984 0 0 0 -0.262001,0.267684 v 0.437697 H 3.344758 v -1.132747 -0.219107 z" />
3</svg>
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 06e55532a..4f2421aea 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -62,7 +62,8 @@
62 62
63@mixin apply-svg-color ($color) { 63@mixin apply-svg-color ($color) {
64 ::ng-deep .feather, 64 ::ng-deep .feather,
65 ::ng-deep .material { 65 ::ng-deep .material,
66 ::ng-deep .misc {
66 color: $color; 67 color: $color;
67 } 68 }
68} 69}
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index a077f77a9..db5af3f91 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -37,6 +37,7 @@ async function run () {
37 console.log(' * `video-language` by Rigel Kent (CC-BY)') 37 console.log(' * `video-language` by Rigel Kent (CC-BY)')
38 console.log(' * `peertube-x` by Solen DP (CC-BY)') 38 console.log(' * `peertube-x` by Solen DP (CC-BY)')
39 console.log(' * `flame` by Freepik (Flaticon License)') 39 console.log(' * `flame` by Freepik (Flaticon License)')
40 console.log(' * `local` by Larea (CC-BY)')
40 } 41 }
41 42
42 { 43 {