diff options
Diffstat (limited to 'client/src/app/+about')
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 ❤ 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 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | ||
2 | import { 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 | }) | ||
9 | export 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 | |||
3 | import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component' | 3 | import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component' |
4 | import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver' | 4 | import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver' |
5 | import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' | 5 | import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' |
6 | import { AboutPeertubeContributorsComponent } from '@app/+about/about-peertube/about-peertube-contributors.component' | ||
7 | import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component' | 6 | import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component' |
8 | import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup' | 7 | import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup' |
9 | import { SharedFormModule } from '@app/shared/shared-forms' | 8 | import { 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 | ||