diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-15 14:43:33 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-15 14:43:33 +0200 |
commit | b13a0a48bacb53e65e665774e621326452045294 (patch) | |
tree | 126ea19d040fe3c1c1853ef32a995912c16b7b61 | |
parent | 04c2dcfc6b78c7e8714597f9d5370b6b2c87dece (diff) | |
download | PeerTube-b13a0a48bacb53e65e665774e621326452045294.tar.gz PeerTube-b13a0a48bacb53e65e665774e621326452045294.tar.zst PeerTube-b13a0a48bacb53e65e665774e621326452045294.zip |
Move alert into to pt-alert-primary
13 files changed, 16 insertions, 20 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html index f225c388d..d0d66d631 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html | |||
@@ -163,7 +163,7 @@ | |||
163 | <ng-container ngProjectAs="description"> | 163 | <ng-container ngProjectAs="description"> |
164 | <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span> | 164 | <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span> |
165 | 165 | ||
166 | <div class="alert alert-info alert-signup" *ngIf="signupAlertMessage">{{ signupAlertMessage }}</div> | 166 | <div class="alert pt-alert-primary alert-signup" *ngIf="signupAlertMessage">{{ signupAlertMessage }}</div> |
167 | </ng-container> | 167 | </ng-container> |
168 | 168 | ||
169 | <ng-container ngProjectAs="extra"> | 169 | <ng-container ngProjectAs="extra"> |
diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html index 23dde86b4..c989d2e38 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html | |||
@@ -1,6 +1,6 @@ | |||
1 | <my-plugin-navigation [pluginType]="pluginType"></my-plugin-navigation> | 1 | <my-plugin-navigation [pluginType]="pluginType"></my-plugin-navigation> |
2 | 2 | ||
3 | <div class="alert alert-info" i18n *ngIf="pluginInstalled"> | 3 | <div class="alert pt-alert-primary" i18n *ngIf="pluginInstalled"> |
4 | To load your new installed plugins or themes, refresh the page. | 4 | To load your new installed plugins or themes, refresh the page. |
5 | </div> | 5 | </div> |
6 | 6 | ||
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 26bfaa583..b99e430dd 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 | |||
@@ -237,7 +237,7 @@ | |||
237 | <ng-template ngbNavContent> | 237 | <ng-template ngbNavContent> |
238 | <div class="row live-settings"> | 238 | <div class="row live-settings"> |
239 | <div class="col-md-12"> | 239 | <div class="col-md-12"> |
240 | <div class="alert alert-info"> | 240 | <div class="alert pt-alert-primary"> |
241 | <my-live-documentation-link></my-live-documentation-link> | 241 | <my-live-documentation-link></my-live-documentation-link> |
242 | </div> | 242 | </div> |
243 | 243 | ||
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html index ecec6045b..f537b939f 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html | |||
@@ -44,7 +44,7 @@ | |||
44 | {{ error }} | 44 | {{ error }} |
45 | </div> | 45 | </div> |
46 | 46 | ||
47 | <div class="alert alert-info" i18n *ngIf="isInUpdateForm && getMaxLiveDuration() >= 0"> | 47 | <div class="alert pt-alert-primary" i18n *ngIf="isInUpdateForm && getMaxLiveDuration() >= 0"> |
48 | Max live duration is {{ getMaxLiveDuration() | myDurationFormatter }}. | 48 | Max live duration is {{ getMaxLiveDuration() | myDurationFormatter }}. |
49 | If your live reaches this limit, it will be automatically terminated. | 49 | If your live reaches this limit, it will be automatically terminated. |
50 | </div> | 50 | </div> |
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html index 14a7a287a..aa34d644a 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html | |||
@@ -52,7 +52,7 @@ | |||
52 | {{ error }} | 52 | {{ error }} |
53 | </div> | 53 | </div> |
54 | 54 | ||
55 | <div *ngIf="hasImportedVideo && !error" class="alert alert-info" i18n> | 55 | <div *ngIf="hasImportedVideo && !error" class="alert pt-alert-primary" i18n> |
56 | Congratulations, the video will be imported with BitTorrent! You can already add information about this video. | 56 | Congratulations, the video will be imported with BitTorrent! You can already add information about this video. |
57 | </div> | 57 | </div> |
58 | 58 | ||
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html index 60a43c870..67e1cb418 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html | |||
@@ -45,7 +45,7 @@ | |||
45 | {{ error }} | 45 | {{ error }} |
46 | </div> | 46 | </div> |
47 | 47 | ||
48 | <div *ngIf="!error && hasImportedVideo" class="alert alert-info" i18n> | 48 | <div *ngIf="!error && hasImportedVideo" class="alert pt-alert-primary" i18n> |
49 | Congratulations, the video behind {{ targetUrl }} will be imported! You can already add information about this video. | 49 | Congratulations, the video behind {{ targetUrl }} will be imported! You can already add information about this video. |
50 | </div> | 50 | </div> |
51 | 51 | ||
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html index 860fb76fa..728884986 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html | |||
@@ -87,7 +87,7 @@ | |||
87 | {{ error }} | 87 | {{ error }} |
88 | </div> | 88 | </div> |
89 | 89 | ||
90 | <div *ngIf="videoUploaded && !error" class="alert alert-info" i18n> | 90 | <div *ngIf="videoUploaded && !error" class="alert pt-alert-primary" i18n> |
91 | Congratulations! Your video is now available in your private library. | 91 | Congratulations! Your video is now available in your private library. |
92 | </div> | 92 | </div> |
93 | 93 | ||
diff --git a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html index be726c990..79b83811d 100644 --- a/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html +++ b/client/src/app/+videos/+video-watch/shared/information/video-alert.component.html | |||
@@ -22,15 +22,15 @@ | |||
22 | The video is being moved to an external server, it may not work properly. | 22 | The video is being moved to an external server, it may not work properly. |
23 | </div> | 23 | </div> |
24 | 24 | ||
25 | <div i18n class="alert alert-info" *ngIf="hasVideoScheduledPublication()"> | 25 | <div i18n class="alert pt-alert-primary" *ngIf="hasVideoScheduledPublication()"> |
26 | This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}. | 26 | This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}. |
27 | </div> | 27 | </div> |
28 | 28 | ||
29 | <div i18n class="alert alert-info" *ngIf="isWaitingForLive()"> | 29 | <div i18n class="alert pt-alert-primary" *ngIf="isWaitingForLive()"> |
30 | This live has not started yet. | 30 | This live has not started yet. |
31 | </div> | 31 | </div> |
32 | 32 | ||
33 | <div i18n class="alert alert-info" *ngIf="isLiveEnded()"> | 33 | <div i18n class="alert pt-alert-primary" *ngIf="isLiveEnded()"> |
34 | This live has ended. | 34 | This live has ended. |
35 | </div> | 35 | </div> |
36 | 36 | ||
diff --git a/client/src/app/shared/shared-main/misc/channels-setup-message.component.html b/client/src/app/shared/shared-main/misc/channels-setup-message.component.html index 3fe888a35..539df06bd 100644 --- a/client/src/app/shared/shared-main/misc/channels-setup-message.component.html +++ b/client/src/app/shared/shared-main/misc/channels-setup-message.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <div *ngIf="hasChannelNotConfigured()" class="channels-setup-message alert alert-info"> | 1 | <div *ngIf="hasChannelNotConfigured()" class="channels-setup-message alert pt-alert-primary"> |
2 | <my-global-icon iconName="tip"></my-global-icon> | 2 | <my-global-icon iconName="tip"></my-global-icon> |
3 | 3 | ||
4 | <div> | 4 | <div> |
diff --git a/client/src/app/shared/shared-video-live/live-documentation-link.component.html b/client/src/app/shared/shared-video-live/live-documentation-link.component.html index acf8a71eb..27248645f 100644 --- a/client/src/app/shared/shared-video-live/live-documentation-link.component.html +++ b/client/src/app/shared/shared-video-live/live-documentation-link.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <div i18n> | 1 | <p i18n> |
2 | See <a href="https://docs.joinpeertube.org/use-create-upload-video?id=publish-a-live-in-peertube-gt-v3" target="_blank" rel="noopener noreferrer">the documentation</a> | 2 | See <a class="link-orange" href="https://docs.joinpeertube.org/use-create-upload-video?id=publish-a-live-in-peertube-gt-v3" target="_blank" rel="noopener noreferrer">the documentation</a> |
3 | to learn how to use the PeerTube live streaming feature. | 3 | to learn how to use the PeerTube live streaming feature. |
4 | </div> | 4 | </p> |
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html index 6505e50e2..99c7dbd4c 100644 --- a/client/src/app/shared/shared-video-live/live-stream-information.component.html +++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <div class="pt-badge badge-blue" *ngIf="live.saveReplay" i18n>Replay will be saved</div> | 11 | <div class="pt-badge badge-blue" *ngIf="live.saveReplay" i18n>Replay will be saved</div> |
12 | </div> | 12 | </div> |
13 | 13 | ||
14 | <div class="alert alert-info"> | 14 | <div class="alert pt-alert-primary"> |
15 | <my-live-documentation-link></my-live-documentation-link> | 15 | <my-live-documentation-link></my-live-documentation-link> |
16 | </div> | 16 | </div> |
17 | 17 | ||
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.scss b/client/src/app/shared/shared-video-live/live-stream-information.component.scss index fc0b1cea2..a0cb30897 100644 --- a/client/src/app/shared/shared-video-live/live-stream-information.component.scss +++ b/client/src/app/shared/shared-video-live/live-stream-information.component.scss | |||
@@ -9,7 +9,7 @@ p-autocomplete { | |||
9 | margin: 20px 0; | 9 | margin: 20px 0; |
10 | } | 10 | } |
11 | 11 | ||
12 | .alert-info { | 12 | .pt-alert-primary { |
13 | margin: 1rem 0; | 13 | margin: 1rem 0; |
14 | } | 14 | } |
15 | 15 | ||
diff --git a/client/src/sass/class-helpers.scss b/client/src/sass/class-helpers.scss index 218ca3e76..42e41c96f 100644 --- a/client/src/sass/class-helpers.scss +++ b/client/src/sass/class-helpers.scss | |||
@@ -246,10 +246,6 @@ label + .form-group-description { | |||
246 | // --------------------------------------------------------------------------- | 246 | // --------------------------------------------------------------------------- |
247 | 247 | ||
248 | .alert { | 248 | .alert { |
249 | p { | ||
250 | font-size: 16px; | ||
251 | } | ||
252 | |||
253 | p:last-child { | 249 | p:last-child { |
254 | margin-bottom: 0; | 250 | margin-bottom: 0; |
255 | } | 251 | } |