From de702865f47f647fafb34ca05dde3ea780a4ecb1 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 6 Mar 2020 15:05:19 +0100
Subject: [PATCH] Share modal light UI simplification

---
 .../modal/video-share.component.html          | 44 +++++++++----------
 .../modal/video-share.component.scss          |  4 +-
 client/src/sass/include/_mixins.scss          |  2 +-
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html
index 593dd8529..dd2dd34ab 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.html
@@ -92,26 +92,6 @@
           </div>
         </div>
 
-        <div (click)="isAdvancedCustomizationCollapsed = !isAdvancedCustomizationCollapsed" role="button" class="advanced-filters-button"
-             [attr.aria-expanded]="!isAdvancedCustomizationCollapsed" aria-controls="collapseBasic">
-
-          <ng-container *ngIf="isAdvancedCustomizationCollapsed">
-            <span class="glyphicon glyphicon-menu-down"></span>
-
-            <ng-container i18n>
-              More customization
-            </ng-container>
-          </ng-container>
-
-          <ng-container *ngIf="!isAdvancedCustomizationCollapsed">
-            <span class="glyphicon glyphicon-menu-up"></span>
-
-            <ng-container i18n>
-              Less customization
-            </ng-container>
-          </ng-container>
-        </div>
-
         <div class="advanced-filters collapse-transition" [ngbCollapse]="isAdvancedCustomizationCollapsed">
           <div>
             <div class="form-group stop-at">
@@ -174,12 +154,28 @@
             </div>
           </ng-container>
         </div>
+
+        <div (click)="isAdvancedCustomizationCollapsed = !isAdvancedCustomizationCollapsed" role="button" class="advanced-filters-button"
+             [attr.aria-expanded]="!isAdvancedCustomizationCollapsed" aria-controls="collapseBasic">
+
+          <ng-container *ngIf="isAdvancedCustomizationCollapsed">
+            <span class="glyphicon glyphicon-menu-down"></span>
+
+            <ng-container i18n>
+              More customization
+            </ng-container>
+          </ng-container>
+
+          <ng-container *ngIf="!isAdvancedCustomizationCollapsed">
+            <span class="glyphicon glyphicon-menu-up"></span>
+
+            <ng-container i18n>
+              Less customization
+            </ng-container>
+          </ng-container>
+        </div>
       </div>
     </div>
   </div>
 
-  <div class="modal-footer inputs">
-    <span i18n class="action-button action-button-cancel" (click)="hide()">Close</span>
-  </div>
-
 </ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/videos/+video-watch/modal/video-share.component.scss
index 8b5952da6..a5766d983 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.scss
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.scss
@@ -39,14 +39,12 @@ my-input-readonly-copy {
 
 .filters {
   margin-top: 30px;
-  padding-top: 30px;
-  border-top: 1px solid $separator-border-color;
 
   .advanced-filters-button {
     display: flex;
     justify-content: center;
     align-items: center;
-    margin-top: 30px;
+    margin-top: 20px;
     font-size: 16px;
     font-weight: $font-semibold;
     cursor: pointer;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index bafc82d7d..de9c9d6d6 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -527,7 +527,7 @@
 
   .links {
     margin-top: 0;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
 
     a {
       margin-top: 0;
-- 
2.41.0