aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-07-24 16:12:35 +0200
committerChocobozzz <me@florianbigard.com>2019-07-25 11:00:43 +0200
commit03652b3179b7d3d2959b68318fdc5e00f94eb95f (patch)
tree4e24adb0d7ecb89b23f4c86bae402af3b660f934 /client/src/app
parentf36da21e40104a50acb00132920b835240cebb38 (diff)
downloadPeerTube-03652b3179b7d3d2959b68318fdc5e00f94eb95f.tar.gz
PeerTube-03652b3179b7d3d2959b68318fdc5e00f94eb95f.tar.zst
PeerTube-03652b3179b7d3d2959b68318fdc5e00f94eb95f.zip
Use ::ng-deep instead of /deep/
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.scss2
-rw-r--r--client/src/app/+admin/plugins/shared/toggle-plugin-type.scss2
-rw-r--r--client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss2
-rw-r--r--client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss4
-rw-r--r--client/src/app/+signup/+register/register.component.scss2
-rw-r--r--client/src/app/menu/avatar-notification.component.scss4
-rw-r--r--client/src/app/menu/menu.component.scss2
-rw-r--r--client/src/app/search/search.component.scss2
-rw-r--r--client/src/app/shared/buttons/action-dropdown.component.scss2
-rw-r--r--client/src/app/shared/buttons/button.component.scss2
-rw-r--r--client/src/app/shared/forms/markdown-textarea.component.scss2
-rw-r--r--client/src/app/shared/forms/timestamp-input.component.scss2
-rw-r--r--client/src/app/shared/images/global-icon.component.scss2
-rw-r--r--client/src/app/shared/menu/top-menu-dropdown.component.scss4
-rw-r--r--client/src/app/shared/misc/help.component.scss2
-rw-r--r--client/src/app/shared/user-subscription/subscribe-button.component.scss2
-rw-r--r--client/src/app/shared/video/video-actions-dropdown.component.scss2
-rw-r--r--client/src/app/shared/video/video-miniature.component.scss8
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.scss4
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss4
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.scss4
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment.component.scss2
-rw-r--r--client/src/app/videos/+video-watch/video-watch-playlist.component.scss2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss18
24 files changed, 41 insertions, 41 deletions
diff --git a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.scss b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.scss
index 0b54ffda3..9376e38b0 100644
--- a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.scss
+++ b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.scss
@@ -1,6 +1,6 @@
1@import '_variables'; 1@import '_variables';
2@import '_mixins'; 2@import '_mixins';
3 3
4.update-button[disabled="true"] /deep/ .action-button { 4.update-button[disabled="true"] ::ng-deep .action-button {
5 cursor: default !important; 5 cursor: default !important;
6} 6}
diff --git a/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss b/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss
index ea2eda28c..7e2c40aae 100644
--- a/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss
+++ b/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss
@@ -7,7 +7,7 @@
7 margin-bottom: 30px; 7 margin-bottom: 30px;
8 8
9 p-selectButton { 9 p-selectButton {
10 /deep/ { 10 ::ng-deep {
11 .ui-button-text { 11 .ui-button-text {
12 font-size: 15px; 12 font-size: 15px;
13 } 13 }
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss
index 77fce138b..20582e478 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss
@@ -5,7 +5,7 @@
5 @include create-button; 5 @include create-button;
6} 6}
7 7
8/deep/ .action-button { 8::ng-deep .action-button {
9 &.action-button-delete { 9 &.action-button-delete {
10 margin-right: 10px; 10 margin-right: 10px;
11 } 11 }
diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss
index f648c33e4..dd5712c06 100644
--- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss
+++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss
@@ -5,7 +5,7 @@
5 @include create-button; 5 @include create-button;
6} 6}
7 7
8/deep/ .action-button { 8::ng-deep .action-button {
9 &.action-button-delete { 9 &.action-button-delete {
10 margin-right: 10px; 10 margin-right: 10px;
11 } 11 }
@@ -17,7 +17,7 @@
17 .miniature-wrapper { 17 .miniature-wrapper {
18 flex-grow: 1; 18 flex-grow: 1;
19 19
20 /deep/ .miniature { 20 ::ng-deep .miniature {
21 display: flex; 21 display: flex;
22 22
23 .miniature-info { 23 .miniature-info {
diff --git a/client/src/app/+signup/+register/register.component.scss b/client/src/app/+signup/+register/register.component.scss
index 8d14992e7..9405b5293 100644
--- a/client/src/app/+signup/+register/register.component.scss
+++ b/client/src/app/+signup/+register/register.component.scss
@@ -70,7 +70,7 @@ button {
70 my-loader { 70 my-loader {
71 margin-bottom: 20px; 71 margin-bottom: 20px;
72 72
73 /deep/ .loader div { 73 ::ng-deep .loader div {
74 border-color: var(--mainColor) transparent transparent transparent; 74 border-color: var(--mainColor) transparent transparent transparent;
75 } 75 }
76 76
diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss
index 201668b6e..5e09225df 100644
--- a/client/src/app/menu/avatar-notification.component.scss
+++ b/client/src/app/menu/avatar-notification.component.scss
@@ -1,7 +1,7 @@
1@import '_variables'; 1@import '_variables';
2@import '_mixins'; 2@import '_mixins';
3 3
4/deep/ { 4::ng-deep {
5 .popover-notifications.popover { 5 .popover-notifications.popover {
6 max-width: none; 6 max-width: none;
7 7
@@ -99,7 +99,7 @@
99} 99}
100 100
101@media screen and (max-width: $mobile-view) { 101@media screen and (max-width: $mobile-view) {
102 /deep/ { 102 ::ng-deep {
103 .popover-notifications.popover .popover-body { 103 .popover-notifications.popover .popover-body {
104 width: 400px; 104 width: 400px;
105 } 105 }
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 06baa52d3..76e73155c 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -82,7 +82,7 @@ menu {
82 border: none; 82 border: none;
83 } 83 }
84 84
85 /deep/ { 85 ::ng-deep {
86 @include apply-svg-color(var(--menuForegroundColor)); 86 @include apply-svg-color(var(--menuForegroundColor));
87 } 87 }
88 } 88 }
diff --git a/client/src/app/search/search.component.scss b/client/src/app/search/search.component.scss
index 3343a276d..d4d8bbcf7 100644
--- a/client/src/app/search/search.component.scss
+++ b/client/src/app/search/search.component.scss
@@ -115,7 +115,7 @@
115 my-video-thumbnail { 115 my-video-thumbnail {
116 margin-right: 0 !important; 116 margin-right: 0 !important;
117 117
118 /deep/ .video-thumbnail { 118 ::ng-deep .video-thumbnail {
119 width: 100%; 119 width: 100%;
120 height: auto; 120 height: auto;
121 121
diff --git a/client/src/app/shared/buttons/action-dropdown.component.scss b/client/src/app/shared/buttons/action-dropdown.component.scss
index 7c2b0db71..2f7e848d5 100644
--- a/client/src/app/shared/buttons/action-dropdown.component.scss
+++ b/client/src/app/shared/buttons/action-dropdown.component.scss
@@ -33,7 +33,7 @@
33 .more-icon { 33 .more-icon {
34 width: 21px; 34 width: 21px;
35 35
36 /deep/ { 36 ::ng-deep {
37 @include apply-svg-color(var(--mainForegroundColor)); 37 @include apply-svg-color(var(--mainForegroundColor));
38 } 38 }
39 } 39 }
diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss
index 4cc2b0573..2a8cfc748 100644
--- a/client/src/app/shared/buttons/button.component.scss
+++ b/client/src/app/shared/buttons/button.component.scss
@@ -1,7 +1,7 @@
1@import '_variables'; 1@import '_variables';
2@import '_mixins'; 2@import '_mixins';
3 3
4my-small-loader /deep/ .root { 4my-small-loader ::ng-deep .root {
5 display: inline-block; 5 display: inline-block;
6 margin: 0 3px 0 0; 6 margin: 0 3px 0 0;
7 width: 20px; 7 width: 20px;
diff --git a/client/src/app/shared/forms/markdown-textarea.component.scss b/client/src/app/shared/forms/markdown-textarea.component.scss
index 118b38b91..eacaf36a2 100644
--- a/client/src/app/shared/forms/markdown-textarea.component.scss
+++ b/client/src/app/shared/forms/markdown-textarea.component.scss
@@ -16,7 +16,7 @@
16 flex-grow: 1; 16 flex-grow: 1;
17 } 17 }
18 18
19 /deep/ { 19 ::ng-deep {
20 .nav-link { 20 .nav-link {
21 display: flex !important; 21 display: flex !important;
22 align-items: center; 22 align-items: center;
diff --git a/client/src/app/shared/forms/timestamp-input.component.scss b/client/src/app/shared/forms/timestamp-input.component.scss
index 7115777fd..e7dbcd997 100644
--- a/client/src/app/shared/forms/timestamp-input.component.scss
+++ b/client/src/app/shared/forms/timestamp-input.component.scss
@@ -1,5 +1,5 @@
1p-inputmask { 1p-inputmask {
2 /deep/ input { 2 ::ng-deep input {
3 width: 80px; 3 width: 80px;
4 font-size: 15px; 4 font-size: 15px;
5 5
diff --git a/client/src/app/shared/images/global-icon.component.scss b/client/src/app/shared/images/global-icon.component.scss
index 6805fb6f7..32fb9badb 100644
--- a/client/src/app/shared/images/global-icon.component.scss
+++ b/client/src/app/shared/images/global-icon.component.scss
@@ -1,4 +1,4 @@
1/deep/ svg { 1::ng-deep svg {
2 width: inherit; 2 width: inherit;
3 height: inherit; 3 height: inherit;
4} 4}
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.scss b/client/src/app/shared/menu/top-menu-dropdown.component.scss
index d7c7de957..1be699a88 100644
--- a/client/src/app/shared/menu/top-menu-dropdown.component.scss
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.scss
@@ -11,12 +11,12 @@
11 } 11 }
12} 12}
13 13
14/deep/ .dropdown-toggle::after { 14::ng-deep .dropdown-toggle::after {
15 position: relative; 15 position: relative;
16 top: 2px; 16 top: 2px;
17} 17}
18 18
19/deep/ .dropdown-menu { 19::ng-deep .dropdown-menu {
20 margin-top: 0 !important; 20 margin-top: 0 !important;
21} 21}
22 22
diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss
index 3898f3cda..84e176b34 100644
--- a/client/src/app/shared/misc/help.component.scss
+++ b/client/src/app/shared/misc/help.component.scss
@@ -15,7 +15,7 @@
15 } 15 }
16} 16}
17 17
18/deep/ { 18::ng-deep {
19 .help-popover { 19 .help-popover {
20 max-width: 300px; 20 max-width: 300px;
21 21
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.scss b/client/src/app/shared/user-subscription/subscribe-button.component.scss
index 15fb83c05..92a28aad9 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.scss
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.scss
@@ -61,7 +61,7 @@
61 padding-left: 1rem; 61 padding-left: 1rem;
62 } 62 }
63 63
64 /deep/ form { 64 ::ng-deep form {
65 padding: 0.25rem 1rem; 65 padding: 0.25rem 1rem;
66 } 66 }
67 67
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.scss b/client/src/app/shared/video/video-actions-dropdown.component.scss
index 7ffdce822..67d7ee86a 100644
--- a/client/src/app/shared/video/video-actions-dropdown.component.scss
+++ b/client/src/app/shared/video/video-actions-dropdown.component.scss
@@ -7,6 +7,6 @@
7 } 7 }
8} 8}
9 9
10/deep/ .icon-playlist-add { 10::ng-deep .icon-playlist-add {
11 left: 2px; 11 left: 2px;
12} 12}
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss
index d665ce021..dac178bde 100644
--- a/client/src/app/shared/video/video-miniature.component.scss
+++ b/client/src/app/shared/video/video-miniature.component.scss
@@ -68,16 +68,16 @@ $more-margin-right: 10px;
68 width: $more-button-width; 68 width: $more-button-width;
69 height: 30px; 69 height: 30px;
70 70
71 /deep/ .dropdown-root:not(.show) { 71 ::ng-deep .dropdown-root:not(.show) {
72 opacity: 0; 72 opacity: 0;
73 } 73 }
74 74
75 /deep/ .playlist-dropdown.show + my-action-dropdown .dropdown-root { 75 ::ng-deep .playlist-dropdown.show + my-action-dropdown .dropdown-root {
76 opacity: 1; 76 opacity: 1;
77 } 77 }
78 } 78 }
79 79
80 &:hover .video-actions /deep/ .dropdown-root { 80 &:hover .video-actions ::ng-deep .dropdown-root {
81 opacity: 1; 81 opacity: 1;
82 } 82 }
83 83
@@ -90,7 +90,7 @@ $more-margin-right: 10px;
90 margin: 0; 90 margin: 0;
91 top: -3px; 91 top: -3px;
92 92
93 /deep/ .dropdown-root { 93 ::ng-deep .dropdown-root {
94 opacity: 1 !important; 94 opacity: 1 !important;
95 } 95 }
96 } 96 }
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index bb775cb0a..9479c588a 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -122,7 +122,7 @@ my-peertube-checkbox {
122p-calendar { 122p-calendar {
123 display: block; 123 display: block;
124 124
125 /deep/ { 125 ::ng-deep {
126 input, 126 input,
127 .ui-calendar { 127 .ui-calendar {
128 width: 100%; 128 width: 100%;
@@ -135,7 +135,7 @@ p-calendar {
135 } 135 }
136} 136}
137 137
138/deep/ { 138::ng-deep {
139 .root-tabset > .nav { 139 .root-tabset > .nav {
140 margin-bottom: 15px; 140 margin-bottom: 15px;
141 } 141 }
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
index 684342f09..b5628e276 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
@@ -25,7 +25,7 @@
25 p-progressBar { 25 p-progressBar {
26 flex-grow: 1; 26 flex-grow: 1;
27 27
28 /deep/ .ui-progressbar { 28 ::ng-deep .ui-progressbar {
29 font-size: 15px !important; 29 font-size: 15px !important;
30 height: 30px !important; 30 height: 30px !important;
31 border-radius: 3px !important; 31 border-radius: 3px !important;
@@ -45,7 +45,7 @@
45 } 45 }
46 46
47 &.processing { 47 &.processing {
48 /deep/ .ui-progressbar-label { 48 ::ng-deep .ui-progressbar-label {
49 // Same color as background to hide "100%" 49 // Same color as background to hide "100%"
50 color: rgba(11, 204, 41, 0.16) !important; 50 color: rgba(11, 204, 41, 0.16) !important;
51 51
diff --git a/client/src/app/videos/+video-edit/video-add.component.scss b/client/src/app/videos/+video-edit/video-add.component.scss
index dd97b79ee..da711ec5b 100644
--- a/client/src/app/videos/+video-edit/video-add.component.scss
+++ b/client/src/app/videos/+video-edit/video-add.component.scss
@@ -5,7 +5,7 @@ $border-width: 3px;
5$border-type: solid; 5$border-type: solid;
6$border-color: #EAEAEA; 6$border-color: #EAEAEA;
7 7
8/deep/ .root-tabset.video-add-tabset { 8::ng-deep .root-tabset.video-add-tabset {
9 &.hide-nav > .nav { 9 &.hide-nav > .nav {
10 display: none !important; 10 display: none !important;
11 } 11 }
@@ -52,4 +52,4 @@ $border-color: #EAEAEA;
52 justify-content: center; 52 justify-content: center;
53 align-items: center; 53 align-items: center;
54 } 54 }
55} \ No newline at end of file 55}
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
index 731ecbf8f..c3ab1ab01 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
@@ -50,7 +50,7 @@
50 @include peertube-word-wrap; 50 @include peertube-word-wrap;
51 51
52 // Mentions 52 // Mentions
53 /deep/ a { 53 ::ng-deep a {
54 54
55 &:not(.linkified-url) { 55 &:not(.linkified-url) {
56 @include disable-default-a-behaviour; 56 @include disable-default-a-behaviour;
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss b/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
index 5da55c2f8..eeb763bd9 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
@@ -37,7 +37,7 @@
37 } 37 }
38 38
39 my-video-playlist-element-miniature { 39 my-video-playlist-element-miniature {
40 /deep/ { 40 ::ng-deep {
41 .video { 41 .video {
42 .position { 42 .position {
43 margin-right: 0; 43 margin-right: 0;
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index 35ea0fffd..5dc79c6b7 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -31,14 +31,14 @@ $player-factor: 1.7; // 16/9
31 width: 100%; 31 width: 100%;
32 } 32 }
33 33
34 /deep/ .video-js { 34 ::ng-deep .video-js {
35 $height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); 35 $height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
36 36
37 height: $height; 37 height: $height;
38 width: 100%; 38 width: 100%;
39 } 39 }
40 40
41 my-video-watch-playlist /deep/ .playlist { 41 my-video-watch-playlist ::ng-deep .playlist {
42 @include playlist-below-player; 42 @include playlist-below-player;
43 } 43 }
44 } 44 }
@@ -81,7 +81,7 @@ $player-factor: 1.7; // 16/9
81 } 81 }
82 } 82 }
83 83
84 /deep/ .video-js { 84 ::ng-deep .video-js {
85 width: getPlayerWidth(66vh); 85 width: getPlayerWidth(66vh);
86 height: 66vh; 86 height: 66vh;
87 87
@@ -94,7 +94,7 @@ $player-factor: 1.7; // 16/9
94 94
95 @media screen and (max-width: 600px) { 95 @media screen and (max-width: 600px) {
96 .remote-server-down, 96 .remote-server-down,
97 /deep/ .video-js { 97 ::ng-deep .video-js {
98 width: 100vw; 98 width: 100vw;
99 height: getPlayerHeight(100vw) 99 height: getPlayerHeight(100vw)
100 } 100 }
@@ -344,7 +344,7 @@ $player-factor: 1.7; // 16/9
344 } 344 }
345 } 345 }
346 346
347 /deep/ .other-videos { 347 ::ng-deep .other-videos {
348 padding-left: 15px; 348 padding-left: 15px;
349 flex-basis: $other-videos-width; 349 flex-basis: $other-videos-width;
350 min-width: $other-videos-width; 350 min-width: $other-videos-width;
@@ -456,7 +456,7 @@ my-video-comments {
456 flex-direction: column; 456 flex-direction: column;
457 justify-content: center; 457 justify-content: center;
458 458
459 my-video-watch-playlist /deep/ .playlist { 459 my-video-watch-playlist ::ng-deep .playlist {
460 @include playlist-below-player; 460 @include playlist-below-player;
461 } 461 }
462 } 462 }
@@ -464,10 +464,10 @@ my-video-comments {
464 .video-bottom { 464 .video-bottom {
465 flex-direction: column; 465 flex-direction: column;
466 466
467 /deep/ .other-videos { 467 ::ng-deep .other-videos {
468 padding-left: 0 !important; 468 padding-left: 0 !important;
469 469
470 /deep/ .video-miniature { 470 ::ng-deep .video-miniature {
471 flex-direction: row; 471 flex-direction: row;
472 width: auto; 472 width: auto;
473 } 473 }
@@ -492,7 +492,7 @@ my-video-comments {
492 } 492 }
493 } 493 }
494 494
495 /deep/ .other-videos .video-miniature { 495 ::ng-deep .other-videos .video-miniature {
496 flex-direction: column; 496 flex-direction: column;
497 } 497 }
498 498