Merge branch 'dev' into fix/toggle-category-status

src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html

@@ -19,7 +19,7 @@
       <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-categoria" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
+    <button id="jhi-confirm-delete-categoria" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--toggle">
       <fa-icon [icon]="faExchangeAlt"></fa-icon>
       <span jhiTranslate="entity.action.toggleStatus">Toggle Status</span>
     </button>

src/main/webapp/app/entities/categoria/list/categoria.component.html

@@ -44,7 +44,7 @@
         <input type="text" name="searchString" placeholder="Buscar..." [(ngModel)]="searchString" />
       </div>
     </form>
-    <table class="table table-striped" aria-describedby="page-heading">
+    <table class="ds-table table table-striped" aria-describedby="page-heading">
       <thead>
         <tr>
           <th scope="col"><span jhiTranslate="dataSurveyApp.categoria.nombre">Nombre</span></th>
@@ -67,7 +67,7 @@
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
               </button>
 
-              <button type="submit" (click)="toggleStatus(categoria)" class="ds-btn ds-btn--danger" data-cy="entityDeleteButton">
+              <button type="submit" (click)="toggleStatus(categoria)" class="ds-btn ds-btn--toggle" data-cy="entityDeleteButton">
                 <fa-icon [icon]="faExchangeAlt"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.toggleStatus">Toggle Status</span>
               </button>

src/main/webapp/app/entities/encuesta/list/encuesta.component.html

@@ -213,7 +213,7 @@
   </div>
 </div>
 <div class="table-responsive" id="entities" *ngIf="isAdmin() && encuestas && encuestas.length > 0">
-  <table class="table table-striped" aria-describedby="page-heading">
+  <table class="ds-table table table-striped" aria-describedby="page-heading">
     <thead>
       <tr>
         <th scope="col"><span jhiTranslate="dataSurveyApp.encuesta.nombre">Nombre</span></th>

src/main/webapp/app/entities/plantilla/delete/plantilla-delete-dialog.component.html

@@ -17,7 +17,7 @@
       <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-plantilla" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
+    <button id="jhi-confirm-delete-plantilla" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
       <fa-icon icon="times"></fa-icon>&nbsp;<span jhiTranslate="entity.action.delete">Delete</span>
     </button>
   </div>

src/main/webapp/app/entities/plantilla/list/plantilla.component.html

@@ -64,7 +64,7 @@
   </div>
 
   <div class="table-responsive" id="entities" *ngIf="plantillas && plantillas.length > 0">
-    <table class="table table-striped" aria-describedby="page-heading">
+    <table class="ds-table table table-striped" aria-describedby="page-heading">
       <thead>
         <tr>
           <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.nombre">Nombre</span></th>

src/main/webapp/app/entities/plantilla/plantilla-change-status-dialog/plantilla-change-status-dialog.component.html

@@ -25,8 +25,8 @@
     </button>
 
     <button id="jhi-confirm-change-status-option" data-cy="entityConfirmChangeButton" type="submit" class="ds-btn btn-warning">
-      <fa-icon [icon]="faExchangeAlt"></fa-icon
+      <fa-icon [icon]="faExchangeAlt"></fa-icon>
-      ><span class="d-none d-md-inline" jhiTranslate="dataSurveyApp.plantilla.updated.buttonChangeEstado">Cambiar estado</span>
+      <span class="d-none d-md-inline" jhiTranslate="dataSurveyApp.plantilla.updated.buttonChangeEstado">Cambiar estado</span>
     </button>
   </div>
 </form>

src/main/webapp/app/entities/usuario-encuesta/list/usuario-encuesta.component.html

@@ -44,7 +44,7 @@
   </div>
 
   <div class="table-responsive" id="entities" *ngIf="usuarioEncuestas && usuarioEncuestas.length > 0">
-    <table class="table table-striped" aria-describedby="page-heading">
+    <table class="ds-table table table-striped" aria-describedby="page-heading">
       <thead>
         <tr>
           <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioEncuesta.rol">Rol</span></th>

src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.html

@@ -15,7 +15,7 @@
       <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-usuarioExtra" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
+    <button id="jhi-confirm-delete-usuarioExtra" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--toggle">
       <fa-icon [icon]="faExchangeAlt"></fa-icon>
       <span jhiTranslate="entity.action.toggleStatus">Cambiar estado</span>
     </button>

src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html

@@ -43,7 +43,7 @@
     </div>
   </form>
   <div class="table-responsive" id="entities" *ngIf="usuarioExtras && usuarioExtras.length > 0">
-    <table class="table table-striped" aria-describedby="page-heading">
+    <table class="ds-table table table-striped" aria-describedby="page-heading">
       <thead>
         <tr>
           <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.rol">Rol</span></th>
@@ -96,7 +96,7 @@
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
               </button> -->
 
-              <button type="submit" (click)="delete(usuarioExtra)" class="ds-btn ds-btn--danger" data-cy="entityDeleteButton">
+              <button type="submit" (click)="delete(usuarioExtra)" class="ds-btn ds-btn--toggle" data-cy="entityDeleteButton">
                 <fa-icon [icon]="faExchangeAlt"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.toggleStatus">Toggle Status</span>
               </button>

src/main/webapp/app/entities/usuario-plantillas/list/usuario-plantillas.component.html

@@ -30,7 +30,7 @@
   </div>
 
   <div class="table-responsive" id="entities" *ngIf="misPlantillas && misPlantillas.length > 0">
-    <table class="table table-striped" aria-describedby="page-heading">
+    <table class="ds-table table table-striped" aria-describedby="page-heading">
       <thead>
         <tr>
           <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.nombre">Nombre</span></th>

src/main/webapp/content/scss/paper-dashboard/_datasurvey-buttons.scss

@@ -42,11 +42,11 @@
 }
 
 .ds-btn--toggle {
-  background-color: #ffaa47;
+  background-color: #ff9a27;
   color: #fff;
 
   &:hover {
-    background-color: #e09935;
+    background-color: #d48020;
   }
 }
 

src/main/webapp/content/scss/paper-dashboard/_datasurvey-table.scss

@@ -0,0 +1,25 @@
+.ds-table {
+  thead {
+    th span {
+      color: #2f4159;
+      text-transform: uppercase;
+      font-size: 0.9rem;
+      font-weight: 700;
+    }
+  }
+
+  tbody {
+    tr:nth-child(odd) {
+      background-color: #f1f5f9;
+    }
+
+    td {
+      border: 0;
+      color: #2f4159;
+    }
+  }
+}
+
+.table-responsive {
+  overflow: auto;
+}