aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-04-08 10:30:58 +0200
committerChocobozzz <me@florianbigard.com>2020-04-08 10:30:58 +0200
commit14f83c68f11da3435940504fa4000193fb4943be (patch)
tree7274e778bae4accec5e720c53c8ae7215ecbfd48 /client
parent9870329f6946f5fbbec9860652cee6fb12fdc2aa (diff)
downloadPeerTube-14f83c68f11da3435940504fa4000193fb4943be.tar.gz
PeerTube-14f83c68f11da3435940504fa4000193fb4943be.tar.zst
PeerTube-14f83c68f11da3435940504fa4000193fb4943be.zip
Cleanup menu footer links
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html14
-rw-r--r--client/src/app/menu/menu.component.html32
-rw-r--r--client/src/app/menu/menu.component.scss20
-rw-r--r--client/src/sass/include/_mixins.scss1
4 files changed, 40 insertions, 27 deletions
diff --git a/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html
index b12184ddc..6119e7380 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html
@@ -1,4 +1,18 @@
1<form role="form" (ngSubmit)="updateInterfaceSettings()" [formGroup]="form"> 1<form role="form" (ngSubmit)="updateInterfaceSettings()" [formGroup]="form">
2
3 <div class="form-group">
4 <label i18n for="theme">Interface language</label>
5
6 <div class="peertube-select-container">
7 <select formControlName="theme" id="theme" class="form-control">
8 <option i18n value="instance-default">instance default</option>
9 <option i18n value="default">peertube default</option>
10
11 <option *ngFor="let theme of availableThemes" [value]="theme">{{ theme }}</option>
12 </select>
13 </div>
14 </div>
15
2 <div class="form-group"> 16 <div class="form-group">
3 <label i18n for="theme">Theme</label> 17 <label i18n for="theme">Theme</label>
4 18
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index f1c131184..32e48d6b6 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -149,29 +149,29 @@
149 </a> 149 </a>
150 </div> 150 </div>
151 151
152 <div class="d-flex flex-column"> 152 <div class="bottom-links">
153 <div class="footer-links"> 153
154 <a i18n routerLink="/about/instance">Contact</a>
155 <a i18n routerLink="/about/instance">Terms of Service</a>
156 <a i18n routerLink="/about/instance" fragment="statistics">Stats</a>
157 <a (click)="openLanguageChooser()" class="c-hand">
158 <span i18n>Interface: {{ language }}</span>
159 </a>
160 </div>
161 <div class="footer-links"> 154 <div class="footer-links">
162 <a i18n href="https://joinpeertube.org/#you-are-a-video-maker" i18n-title title="Creator guide" target="_blank" rel="noopener noreferrer">Creators</a> 155 <div *ngIf="isLoggedIn === false">
163 <a i18n href="https://docs.joinpeertube.org/#/contribute-getting-started" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">Contributors</a> 156 <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ language }}</span>
164 <a i18n routerLink="/about/peertube" i18n-title title="More information about privacy within PeerTube">Privacy</a> 157 </div>
165 <a i18n href="https://joinpeertube.org/faq" i18n-title title="Frequently asked questions about PeerTube" target="_blank" rel="noopener noreferrer">FAQ</a> 158
166 <a i18n href="https://docs.joinpeertube.org/api-rest-reference.html" i18n-title title="API documentation" target="_blank" rel="noopener noreferrer">API</a> 159 <div>
167 <a i18n href="https://joinpeertube.org/help" i18n-title title="Get help using PeerTube" target="_blank" rel="noopener noreferrer">Help</a> 160 <a i18n routerLink="/about/instance">Contact</a>
168 <a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Shortcuts</a> 161 <a i18n href="https://joinpeertube.org/help" i18n-title title="Get help using PeerTube" target="_blank" rel="noopener noreferrer">Help</a>
162 <a i18n href="https://joinpeertube.org/faq" i18n-title title="Frequently asked questions about PeerTube" target="_blank" rel="noopener noreferrer">FAQ</a>
163 <a i18n routerLink="/about/instance" fragment="statistics">Stats</a>
164 <a i18n href="https://docs.joinpeertube.org/api-rest-reference.html" i18n-title title="API documentation" target="_blank" rel="noopener noreferrer">API</a>
165 <a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Shortcuts</a>
166 </div>
169 </div> 167 </div>
168
170 <div class="footer-copyleft"> 169 <div class="footer-copyleft">
171 <small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2020"> 170 <small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2020">
172 <a href="https://joinpeertube.org" i18n-title title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n> 171 <a href="https://joinpeertube.org" i18n-title title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n>
173 powered by PeerTube 172 powered by PeerTube
174 </a> 173 </a>
174
175 <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer"> 175 <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">
176 <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2020 176 <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2020
177 </a> 177 </a>
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index a4b1ec000..9ae40493d 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -185,21 +185,21 @@ menu {
185 width: $menu-width; 185 width: $menu-width;
186 padding-bottom: 15px; 186 padding-bottom: 15px;
187 187
188 & > div:not(.panel-block) { 188 .bottom-links {
189 padding-left: $menu-lateral-padding; 189 display: flex;
190 padding-right: $menu-lateral-padding; 190 flex-direction: column;
191 row-gap: 1em; 191 padding: 0 $menu-lateral-padding;
192 } 192 }
193 193
194 $footer-links-base-opacity: .8; 194 $footer-links-base-opacity: .8;
195 195
196 .footer-links { 196 .footer-links {
197 display: inline-flex; 197 &, > div {
198 flex-wrap: wrap; 198 display: flex;
199 199 flex-wrap: wrap;
200 & > a { 200 }
201 @include disable-default-a-behaviour;
202 201
202 a, span[role=button] {
203 display: inline-block; 203 display: inline-block;
204 text-decoration: none; 204 text-decoration: none;
205 color: var(--mainBackgroundColor); 205 color: var(--mainBackgroundColor);
@@ -218,7 +218,7 @@ menu {
218 218
219 my-global-icon { 219 my-global-icon {
220 @include apply-svg-color(var(--mainBackgroundColor)); 220 @include apply-svg-color(var(--mainBackgroundColor));
221 221
222 display: flex; 222 display: flex;
223 width: auto; 223 width: auto;
224 height: 90%; 224 height: 90%;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 56ada6b9e..6a272494b 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -13,7 +13,6 @@
13 } 13 }
14} 14}
15 15
16
17@mixin ellipsis { 16@mixin ellipsis {
18 white-space: nowrap; 17 white-space: nowrap;
19 overflow: hidden; 18 overflow: hidden;