Replace local menu icon

diff --git a/CREDITS.md b/CREDITS.md
index a54cfe5f3835d0fb0c88ab4df9077f631de0e777..6cc369482e4e9292549989c7ea13767f49e15bd2 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -8,8 +8,8 @@
  * Simon Brosdetzko
  * Александр
  * Berto Te
- * Clemens Schielicke
  * Jeff Huang
+ * Clemens Schielicke
  * kontrollanten
  * Laurent Ettouati
  * Racida S
@@ -24,23 +24,23 @@
  * GunChleoc
  * Slimane Selyan AMIRI
  * Zet
- * x
  * Frank Sträter
+ * x
  * Julien Maulny
+ * Kimsible
  * Mark Van den Borre
+ * John Livingston
  * Jorropo
  * Josh Morel
  * BO41
  * Balázs Meskó
+ * Eivind Ødegård
  * Francesc
- * John Livingston
  * mando laress
- * Eivind Ødegård
  * Quentin PAGÈS
  * Besnik Bleta
  * Ihor Hordiichuk
  * ButterflyOfFire
- * Kimsible
  * Xabi
  * buoyantair
  * Balázs Úr
@@ -85,6 +85,7 @@
  * Frank Chang
  * Green-Star
  * Micah Elizabeth Scott
+ * Poslovitch
  * SVNET Libre
  * Thomas Kuntz
  * William Lahti
@@ -104,7 +105,6 @@
  * Mildred
  * Okhin
  * Pierre-Alain TORET
- * Poslovitch
  * Serge Victor
  * Théo Le Calvar
  * Ugaitz
@@ -125,9 +125,11 @@
  * Daniele Garau
  * Dep Pranata
  * Ehsan Gholami
+ * Eric Guichaoua
  * Girish Ramakrishnan
  * Hakim Oubouali
  * Hans Meiser
+ * Hồ Nhất Duy
  * Iñigo A
  * Jefferson Hernandez
  * Joan Montané
@@ -166,7 +168,6 @@
  * Diazepan Medina
  * Dirk Kelly
  * EndoGai
- * Eric Guichaoua
  * Florent Fayolle
  * Florian
  * Frank de Lange
@@ -189,6 +190,7 @@
  * Quentin
  * Ronan
  * SerCom_KC
+ * Stakovicz
  * Thai Localization
  * Valvin
  * YiDai
@@ -384,6 +386,7 @@
  * norrist
  * osauzet
  * philippe lhardy
+ * plr20
  * potedeo
  * sanchis
  * spf
@@ -529,6 +532,7 @@
  * `video-language` by Rigel Kent (CC-BY)
  * `peertube-x` by Solen DP (CC-BY)
  * `flame` by Freepik (Flaticon License)
+ * `local` by Larea (CC-BY)
 
 
 # Contributors to our 2020 crowdfunding :heart:

diff --git a/client/angular.json b/client/angular.json
index dc50bf709f94def34ae97a9fdb33db5bf9ec84af..39fe7aa51aa9820a3a34a78bcce455334626d5b6 100644 (file)
--- a/client/angular.json
+++ b/client/angular.json
@@ -160,7 +160,7 @@
               "debug",
               "p2p-media-loader-hlsjs",
               "video.js",
-              "sha1",
+              "sha.js/sha1",
               "postcss",
               "core-js/features/reflect"
             ],

diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts
index 77592cbb60cc9bf9aeaa64b6afb39841596373e4..4e00d0bce265e8f36033ca4d780494a43d66af67 100644 (file)
--- 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 {
         priority: 130
       },
       {
-        icon: 'octagon' as 'octagon',
+        icon: 'local' as 'local',
         label: $localize`Local videos`,
         menuLabel: $localize`Local videos`,
         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 a4dd72db6e06b1e08cb16cedf5d0f9a5600d93ed..a47f07fc3f1f51d5a41150edf625a6f6a71e7f0e 100644 (file)
--- 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 = {
   'follower': require('!!raw-loader?!../../../assets/images/misc/account-arrow-left.svg').default, // material ui
   'following': require('!!raw-loader?!../../../assets/images/misc/account-arrow-right.svg').default, // material ui
   'flame': require('!!raw-loader?!../../../assets/images/misc/flame.svg').default,
+  'local': require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
 
   // feather icons
   'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
@@ -72,7 +73,6 @@ const icons = {
   'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default,
   'message-circle': require('!!raw-loader?!../../../assets/images/feather/message-circle.svg').default,
   'codesandbox': require('!!raw-loader?!../../../assets/images/feather/codesandbox.svg').default,
-  'octagon': require('!!raw-loader?!../../../assets/images/feather/octagon.svg').default,
   'award': require('!!raw-loader?!../../../assets/images/feather/award.svg').default
 }
 

diff --git a/client/src/assets/images/feather/octagon.svg b/client/src/assets/images/feather/octagon.svg
deleted file mode 100644 (file)
index 1ed9bac..0000000
--- a/client/src/assets/images/feather/octagon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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">
-  <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>
-</svg>

diff --git a/client/src/assets/images/misc/local.svg b/client/src/assets/images/misc/local.svg
new file mode 100644 (file)
index 0000000..99012b9
--- /dev/null
+++ b/client/src/assets/images/misc/local.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.4666667 8.4666667" x="0px" y="0px" class="misc">
+    <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" />
+</svg>

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 06e55532ac09c526688bea1eed9567ec3173ef4b..4f2421aea3d80c129ee6bc1dfee30769faf891eb 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -62,7 +62,8 @@
 
 @mixin apply-svg-color ($color) {
   ::ng-deep .feather,
-  ::ng-deep .material {
+  ::ng-deep .material,
+  ::ng-deep .misc {
     color: $color;
   }
 }

diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index a077f77a92993df5e643f0d771ee67d18f2e4278..db5af3f9152dadc350d624c6a49f34a914eeb346 100755 (executable)
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -37,6 +37,7 @@ async function run () {
     console.log(' * `video-language` by Rigel Kent (CC-BY)')
     console.log(' * `peertube-x` by Solen DP (CC-BY)')
     console.log(' * `flame` by Freepik (Flaticon License)')
+    console.log(' * `local` by Larea (CC-BY)')
   }
 
   {