8 files changed, 67 insertions, 28 deletions

diff --git a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html
index f4ff32366..205d23cd5 100644
--- a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html
+++ b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html
@@ -1,12 +1,15 @@
-<h1 class="d-flex justify-content-between">
+<h1>
   <span>
     <my-global-icon iconName="channel" aria-hidden="true"></my-global-icon>
     <ng-container i18n>My channels</ng-container>
     <span class="badge badge-secondary">{{ totalItems }}</span>
   </span>
+</h1>
 
+<div class="video-channels-header d-flex justify-content-between">
   <div class="has-feedback has-clear">
-    <input type="text" placeholder="Search your channels" i18n-placeholder [(ngModel)]="channelsSearch" (ngModelChange)="onChannelsSearchChanged()" />
+    <input type="text" placeholder="Search your channels" i18n-placeholder [(ngModel)]="channelsSearch"
+      (ngModelChange)="onChannelsSearchChanged()" />
     <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
     <span class="sr-only" i18n>Clear filters</span>
   </div>
@@ -15,7 +18,7 @@
     <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
     <ng-container i18n>Create video channel</ng-container>
   </a>
-</h1>
+</div>
 
 <div class="video-channels">
   <div *ngFor="let videoChannel of videoChannels; let i = index" class="video-channel">
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 4ecb4f408..cbd999fbd 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
@@ -64,6 +64,10 @@ input[type=text] {
   top: 1px;
 }
 
+.video-channels-header {
+  margin-bottom: 30px;
+}
+
 @media screen and (max-width: $small-view) {
   .video-channels-header {
     text-align: center;
@@ -97,6 +101,17 @@ input[type=text] {
   }
 }
 
+@media screen and (max-width: $mobile-view) {
+  .video-channels-header {
+    flex-direction: column;
+
+    input[type=text] {
+      width: 100% !important;
+      margin-bottom: 12px;
+    }
+  }
+}
+
 @media screen and (min-width: breakpoint(lg)) {
   :host-context(.main-col:not(.expanded)) {
     .video-channel-buttons {
diff --git a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html
index 6cec7c0d5..6ab3826ba 100644
--- a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html
+++ b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html
@@ -1,16 +1,19 @@
-<h1 class="d-flex justify-content-between">
+<h1>
   <span>
     <my-global-icon iconName="subscriptions" aria-hidden="true"></my-global-icon>
     <ng-container i18n>My subscriptions</ng-container>
     <span class="badge badge-secondary"> {{ pagination.totalItems }}</span>
   </span>
+</h1>
 
+<div class="video-subscriptions-header d-flex justify-content-between">
   <div class="has-feedback has-clear">
-    <input type="text" placeholder="Search your subscriptions" i18n-placeholder [(ngModel)]="subscriptionsSearch" (ngModelChange)="onSubscriptionsSearchChanged()" />
+    <input type="text" placeholder="Search your subscriptions" i18n-placeholder [(ngModel)]="subscriptionsSearch"
+      (ngModelChange)="onSubscriptionsSearchChanged()" />
     <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
     <span class="sr-only" i18n>Clear filters</span>
   </div>
-</h1>
+</div>
 
 <div class="no-results" i18n *ngIf="pagination.totalItems === 0">You don't have any subscriptions yet.</div>
 
diff --git a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.scss b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.scss
index 884959070..5ead45dd8 100644
--- a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.scss
+++ b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.scss
@@ -45,11 +45,11 @@ input[type=text] {
   }
 }
 
-@media screen and (max-width: $small-view) {
-  .video-channels-header {
-    text-align: center;
-  }
+.video-subscriptions-header {
+  margin-bottom: 30px;
+}
 
+@media screen and (max-width: $small-view) {
   .video-channel {
     .video-channel-info {
       padding-bottom: 10px;
@@ -68,4 +68,14 @@ input[type=text] {
   }
 }
 
+@media screen and (max-width: $mobile-view) {
+  .video-subscriptions-header {
+    flex-direction: column;
+
+    input[type=text] {
+      width: 100% !important;
+    }
+  }
+}
+
 
diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html
index 3176bb8da..afcf6a084 100644
--- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html
+++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html
@@ -1,11 +1,14 @@
-<h1 class="d-flex justify-content-between">
+<h1>
   <span>
     <my-global-icon iconName="playlists" aria-hidden="true"></my-global-icon>
     <ng-container i18n>My playlists</ng-container> <span class="badge badge-secondary">{{ pagination.totalItems }}</span>
   </span>
+</h1>
 
+<div class="video-playlists-header d-flex justify-content-between">
   <div class="has-feedback has-clear">
-    <input type="text" placeholder="Search your playlists" i18n-placeholder [(ngModel)]="videoPlaylistsSearch" (ngModelChange)="onVideoPlaylistSearchChanged()" />
+    <input type="text" placeholder="Search your playlists" i18n-placeholder [(ngModel)]="videoPlaylistsSearch"
+      (ngModelChange)="onVideoPlaylistSearchChanged()" />
     <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
     <span class="sr-only" i18n>Clear filters</span>
   </div>
@@ -14,7 +17,7 @@
     <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
     <ng-container i18n>Create playlist</ng-container>
   </a>
-</h1>
+</div>
 
 <div class="video-playlists" myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
   <div *ngFor="let playlist of videoPlaylists" class="video-playlist">
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 ade28c70b..2b7c88246 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
@@ -37,6 +37,10 @@ input[type=text] {
   }
 }
 
+.video-playlists-header {
+  margin-bottom: 30px;
+}
+
 @media screen and (max-width: $small-view) {
   .video-playlists-header {
     text-align: center;
@@ -62,14 +66,6 @@ input[type=text] {
   }
 }
 
-@media only screen and (min-width: $mobile-view) and (max-width: $small-view) {
-  .video-playlists-header {
-    input[type=text] {
-      width: 42% !important;
-    }
-  }
-}
-
 @media screen and (max-width: $mobile-view) {
   .video-playlists-header {
     flex-direction: column;
diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
index 779b42ab7..f2ed0ac99 100644
--- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
+++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
@@ -1,16 +1,19 @@
-<h1 class="d-flex justify-content-between">
+<h1>
   <span>
     <my-global-icon iconName="videos" aria-hidden="true"></my-global-icon>
     <ng-container i18n>My videos</ng-container>
     <span class="badge badge-secondary"> {{ pagination.totalItems }}</span>
   </span>
+</h1>
 
+<div class="videos-header d-flex justify-content-between">
   <div class="has-feedback has-clear">
-    <input type="text" placeholder="Search your videos" i18n-placeholder [(ngModel)]="videosSearch" (ngModelChange)="onVideosSearchChanged()" />
+    <input type="text" placeholder="Search your videos" i18n-placeholder [(ngModel)]="videosSearch"
+      (ngModelChange)="onVideosSearchChanged()" />
     <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
     <span class="sr-only" i18n>Clear filters</span>
   </div>
-</h1>
+</div>
 
 <my-videos-selection
   [pagination]="pagination"
diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss
index 0930b1959..246f46320 100644
--- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss
+++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss
@@ -56,10 +56,6 @@ my-edit-button {
 }
 
 @media screen and (max-width: $small-view) {
-  .videos-header {
-    flex-direction: column;
-  }
-
   .action-button {
     flex-direction: column;
     align-self: center;
@@ -119,3 +115,13 @@ my-edit-button {
     }
   }
 }
+
+@media screen and (max-width: $mobile-view) {
+  .videos-header {
+    flex-direction: column;
+
+    input[type=text] {
+      width: 100% !important;
+    }
+  }
+}