diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-08-05 11:23:37 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-08-05 11:23:37 +0200 |
commit | 9e8929d633a0640158af183f878f9854e8b77065 (patch) | |
tree | 5559e61bf59bfaf7d05c1c8b2891251a88975874 /client | |
parent | 830c762bb67ff150ebaef2e603513ce7dd48faa2 (diff) | |
download | PeerTube-9e8929d633a0640158af183f878f9854e8b77065.tar.gz PeerTube-9e8929d633a0640158af183f878f9854e8b77065.tar.zst PeerTube-9e8929d633a0640158af183f878f9854e8b77065.zip |
adjust help component, fix its instances in video-edit
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/+videos/+video-edit/shared/video-edit.component.html | 18 | ||||
-rw-r--r-- | client/src/app/shared/shared-main/misc/help.component.scss | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index c11a60dce..4d3b84626 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html | |||
@@ -23,7 +23,7 @@ | |||
23 | <ng-container i18n> | 23 | <ng-container i18n> |
24 | Tags could be used to suggest relevant recommendations. <br /> | 24 | Tags could be used to suggest relevant recommendations. <br /> |
25 | There is a maximum of 5 tags. <br /> | 25 | There is a maximum of 5 tags. <br /> |
26 | Press Enter to add a new tag. | 26 | Press <kbd>Enter</kbd> to add a new tag. |
27 | </ng-container> | 27 | </ng-container> |
28 | </ng-template> | 28 | </ng-template> |
29 | </my-help> | 29 | </my-help> |
@@ -230,7 +230,13 @@ | |||
230 | 230 | ||
231 | <div class="form-group"> | 231 | <div class="form-group"> |
232 | <label i18n for="support">Support</label> | 232 | <label i18n for="support">Support</label> |
233 | <my-help helpType="markdownEnhanced" i18n-preHtml preHtml="Short text to tell people how they can support you (membership platform...)."></my-help> | 233 | <my-help helpType="markdownEnhanced"> |
234 | <ng-template ptTemplate="preHtml"> | ||
235 | <ng-container i18n> | ||
236 | Short text to tell people how they can support you (membership platform...). | ||
237 | </ng-container> | ||
238 | </ng-template> | ||
239 | </my-help> | ||
234 | <my-markdown-textarea | 240 | <my-markdown-textarea |
235 | id="support" formControlName="support" markdownType="enhanced" | 241 | id="support" formControlName="support" markdownType="enhanced" |
236 | [classes]="{ 'input-error': formErrors['support'] }" | 242 | [classes]="{ 'input-error': formErrors['support'] }" |
@@ -244,7 +250,13 @@ | |||
244 | <div class="col-md-12 col-xl-4"> | 250 | <div class="col-md-12 col-xl-4"> |
245 | <div class="form-group originally-published-at"> | 251 | <div class="form-group originally-published-at"> |
246 | <label i18n for="originallyPublishedAt">Original publication date</label> | 252 | <label i18n for="originallyPublishedAt">Original publication date</label> |
247 | <my-help i18n-preHtml preHtml="This is the date when the content was originally published (e.g. the release date for a film)"></my-help> | 253 | <my-help> |
254 | <ng-template ptTemplate="preHtml"> | ||
255 | <ng-container i18n> | ||
256 | This is the date when the content was originally published (e.g. the release date for a film) | ||
257 | </ng-container> | ||
258 | </ng-template> | ||
259 | </my-help> | ||
248 | <p-calendar | 260 | <p-calendar |
249 | id="originallyPublishedAt" formControlName="originallyPublishedAt" [dateFormat]="calendarDateFormat" | 261 | id="originallyPublishedAt" formControlName="originallyPublishedAt" [dateFormat]="calendarDateFormat" |
250 | [locale]="calendarLocale" [showTime]="true" [hideOnDateTimeSelect]="true" [monthNavigator]="true" [yearNavigator]="true" [yearRange]="myYearRange" | 262 | [locale]="calendarLocale" [showTime]="true" [hideOnDateTimeSelect]="true" [monthNavigator]="true" [yearNavigator]="true" [yearRange]="myYearRange" |
diff --git a/client/src/app/shared/shared-main/misc/help.component.scss b/client/src/app/shared/shared-main/misc/help.component.scss index 43f33a53a..1e7fb4fc6 100644 --- a/client/src/app/shared/shared-main/misc/help.component.scss +++ b/client/src/app/shared/shared-main/misc/help.component.scss | |||
@@ -8,10 +8,10 @@ | |||
8 | my-global-icon { | 8 | my-global-icon { |
9 | width: 17px; | 9 | width: 17px; |
10 | position: relative; | 10 | position: relative; |
11 | top: -2px; | 11 | top: -1px; |
12 | margin: 5px; | 12 | margin: 5px; |
13 | 13 | ||
14 | @include apply-svg-color(pvar(--mainForegroundColor)) | 14 | @include apply-svg-color(pvar(--greyForegroundColor)) |
15 | } | 15 | } |
16 | } | 16 | } |
17 | 17 | ||