Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry

src/app/components/opCommercial/op-commercial/op-commercial.component.html

@@ -13,25 +13,23 @@
   <app-nav-commercant></app-nav-commercant>
 
   <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Operations commerciales ({{(opCommData | async)?.length}})</h4>
-  <div class="btn-block row" style="padding-top: 2%;">
-    <div class="col-md-12">
-      <div class="float-left">
-        <button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération commerciale</button>
+  <div class="topButtons col-md-12" style="padding-top: 2%;">
+    <div class="btnCreerOp">
+      <button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération commerciale</button>
       <!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
       <!--<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>-->
-      </div>
-      <div *ngIf="(opCommData | async)?.length != 0" class="float-right">
-        <div class="dropdown" dropdown>
-          <button dropdownToggle type="button" class="btn btn-info btn-rounded dropdown-toggle waves-light" mdbRippleRadius>
-            Filtres
-          </button>
+    </div>
+    <div *ngIf="(opCommData | async)?.length != 0" class="btnFiltre">
+      <div class="dropdown" dropdown>
+        <button dropdownToggle type="button" class="btn btn-info btn-rounded dropdown-toggle waves-light" mdbRippleRadius>
+          Filtres
+        </button>
 
-          <div class="dropdown-menu">
-            <a class="dropdown-item" id="opActive" (click)="activeOP('Active')">Actives</a>
-            <a class="dropdown-item" id="opToutes" (click)="activeOP('Toutes')">Toutes</a>
-            <a class="dropdown-item" id="opBloqué" (click)="activeOP('Bloqué')">Bloquées</a>
-            <a class="dropdown-item" id="opInactive" (click)="activeOP('Inactive')">Inactives</a>
-          </div>
+        <div class="dropdown-menu">
+          <a class="dropdown-item" id="opActive" (click)="activeOP('Active')">Actives</a>
+          <a class="dropdown-item" id="opToutes" (click)="activeOP('Toutes')">Toutes</a>
+          <a class="dropdown-item" id="opBloqué" (click)="activeOP('Bloqué')">Bloquées</a>
+          <a class="dropdown-item" id="opInactive" (click)="activeOP('Inactive')">Inactives</a>
         </div>
       </div>
     </div>
@@ -48,8 +46,8 @@
     <p>N'attends plus, crées tes opérations commerciale et envoie les aux futurs parrains affiliés de ton choix !</p>
   </div>
   <div class="list-group wow fadeInUpBig">
-    <div class="card mainCard" *ngFor="let op of opCommData | async">
-      <div *ngIf="(op.status == statutAffiche) || (statutAffiche == 'Toutes')">
+    <div *ngFor="let op of opCommData | async">
+      <div class="card mainCard" *ngIf="(op.status == statutAffiche) || (statutAffiche == 'Toutes')" style="height: 100%">
         <div class="row no-margin" id="testt">
           <div class="col-md-6 mb-1 subCard1" id="subCard1">
             <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">

src/app/components/opCommercial/op-commercial/op-commercial.component.scss

@@ -1,3 +1,13 @@
+.topButtons {
+  display: flex;
+  flex-direction: row;
+}
+
+.btnFiltre {
+  display: flex;
+  margin-left: auto;
+}
+
 .mainCard {
   margin-top: 5%;
   width: 100%;