aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared/shared-main
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-28 09:10:57 +0200
committerChocobozzz <me@florianbigard.com>2021-05-28 09:10:57 +0200
commitd6d96bed80700830063c6055969d2d2ff46c63c6 (patch)
treed1fb4141ca788efaf2a54336e9a6a0df94c20ec6 /client/src/app/shared/shared-main
parent8f608a4cb22ab232cfab20665050764b38bac9c7 (diff)
parentb55e7127d1eb6f167e45db2a1ad00197355d1d2f (diff)
downloadPeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.tar.gz
PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.tar.zst
PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.zip
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'client/src/app/shared/shared-main')
-rw-r--r--client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss3
-rw-r--r--client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts2
2 files changed, 4 insertions, 1 deletions
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss
new file mode 100644
index 000000000..4e37c5e61
--- /dev/null
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss
@@ -0,0 +1,3 @@
1div {
2 height: 100%;
3}
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
index 4d5381e8d..858eff9ba 100644
--- a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
@@ -4,7 +4,7 @@ import { PluginElementPlaceholder } from '@shared/models'
4@Component({ 4@Component({
5 selector: 'my-plugin-placeholder', 5 selector: 'my-plugin-placeholder',
6 template: '<div [id]="getId()"></div>', 6 template: '<div [id]="getId()"></div>',
7 styles: [ 'div { height: 100%; }' ] 7 styleUrls: [ './plugin-placeholder.component.scss' ]
8}) 8})
9 9
10export class PluginPlaceholderComponent { 10export class PluginPlaceholderComponent {