aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+about
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-11-12 11:00:51 +0100
committerChocobozzz <me@florianbigard.com>2021-11-12 11:00:51 +0100
commit8db19c959e437521db195e3cce96cb4386ed51c1 (patch)
tree657fe4eb083bb24acf1aacd2b6a822155ceabb04 /client/src/app/+about
parenta7dbc608714ed1981783cd98fd6909866fa78236 (diff)
downloadPeerTube-8db19c959e437521db195e3cce96cb4386ed51c1.tar.gz
PeerTube-8db19c959e437521db195e3cce96cb4386ed51c1.tar.zst
PeerTube-8db19c959e437521db195e3cce96cb4386ed51c1.zip
Remove contributors list from /about/peertube
Some contributors don't want to be associated to a particular peertube instance
Diffstat (limited to 'client/src/app/+about')
-rw-r--r--client/src/app/+about/about-peertube/about-peertube-contributors.component.html13
-rw-r--r--client/src/app/+about/about-peertube/about-peertube-contributors.component.scss30
-rw-r--r--client/src/app/+about/about-peertube/about-peertube-contributors.component.ts19
-rw-r--r--client/src/app/+about/about-peertube/about-peertube.component.html4
-rw-r--r--client/src/app/+about/about.module.ts2
5 files changed, 1 insertions, 67 deletions
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html b/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
deleted file mode 100644
index 4e7d2389b..000000000
--- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
1<div class="peertube-contributors">
2 <p class="framasoft">
3 <strong i18n>Developed with &#10084; by <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a></strong>
4 </p>
5
6 <p>
7 <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">
8 <img width="150px" src="/client/assets/images/framasoft.png" alt="Framasoft logo"/>
9 </a>
10 </p>
11
12 <div [innerHTML]="creditsHtml"></div>
13</div>
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
deleted file mode 100644
index 41e5ff0c2..000000000
--- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
+++ /dev/null
@@ -1,30 +0,0 @@
1@use '_variables' as *;
2@use '_mixins' as *;
3
4.peertube-contributors {
5 .framasoft {
6 font-size: 18px;
7 }
8
9 > p {
10 text-align: center;
11 }
12
13 ::ng-deep h1 {
14 font-size: 1rem;
15 text-align: center;
16 font-weight: $font-semibold;
17 margin-top: 20px;
18 }
19
20 ::ng-deep ul {
21 padding: 0;
22 text-align: center;
23
24 li {
25 @include margin-right(10px);
26
27 display: inline-block;
28 }
29 }
30}
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts b/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts
deleted file mode 100644
index dd774a4ef..000000000
--- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
1import { Component, OnInit } from '@angular/core'
2import { MarkdownService } from '@app/core'
3
4@Component({
5 selector: 'my-about-peertube-contributors',
6 templateUrl: './about-peertube-contributors.component.html',
7 styleUrls: [ './about-peertube-contributors.component.scss' ]
8})
9export class AboutPeertubeContributorsComponent implements OnInit {
10 creditsHtml: string
11
12 private markdown = require('raw-loader!../../../../../CREDITS.md').default
13
14 constructor (private markdownService: MarkdownService) { }
15
16 async ngOnInit () {
17 this.creditsHtml = await this.markdownService.unsafeMarkdownToHTML(this.markdown, true)
18 }
19}
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index 27dd0f609..62689e3ae 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -1,6 +1,6 @@
1<div class="root"> 1<div class="root">
2 <h1 i18n class="about-peertube-title"> 2 <h1 i18n class="about-peertube-title">
3 What is PeerTube? 3 This website is powered by PeerTube
4 </h1> 4 </h1>
5 5
6 <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.svg" alt="mascot"/> 6 <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.svg" alt="mascot"/>
@@ -63,8 +63,6 @@
63 </div> 63 </div>
64 64
65 <div class="privacy-contributors"> 65 <div class="privacy-contributors">
66 <my-about-peertube-contributors></my-about-peertube-contributors>
67
68 <div class="p2p-privacy"> 66 <div class="p2p-privacy">
69 <h2 class="section-title"> 67 <h2 class="section-title">
70 <div class="anchor" id="privacy"></div> <!-- privacy anchor --> 68 <div class="anchor" id="privacy"></div> <!-- privacy anchor -->
diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts
index dfea52fb8..6a3d72290 100644
--- a/client/src/app/+about/about.module.ts
+++ b/client/src/app/+about/about.module.ts
@@ -3,7 +3,6 @@ import { AboutFollowsComponent } from '@app/+about/about-follows/about-follows.c
3import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component' 3import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component'
4import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver' 4import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver'
5import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' 5import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component'
6import { AboutPeertubeContributorsComponent } from '@app/+about/about-peertube/about-peertube-contributors.component'
7import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component' 6import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component'
8import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup' 7import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup'
9import { SharedFormModule } from '@app/shared/shared-forms' 8import { SharedFormModule } from '@app/shared/shared-forms'
@@ -29,7 +28,6 @@ import { AboutComponent } from './about.component'
29 AboutInstanceComponent, 28 AboutInstanceComponent,
30 AboutPeertubeComponent, 29 AboutPeertubeComponent,
31 AboutFollowsComponent, 30 AboutFollowsComponent,
32 AboutPeertubeContributorsComponent,
33 ContactAdminModalComponent 31 ContactAdminModalComponent
34 ], 32 ],
35 33