diff --git a/src/main/resources/templates/mail/activationEmail.html b/src/main/resources/templates/mail/activationEmail.html
index 673edc0..34a97d2 100644
--- a/src/main/resources/templates/mail/activationEmail.html
+++ b/src/main/resources/templates/mail/activationEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/creationEmail.html b/src/main/resources/templates/mail/creationEmail.html
index e46861a..70fe68f 100644
--- a/src/main/resources/templates/mail/creationEmail.html
+++ b/src/main/resources/templates/mail/creationEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/encuestaPrivadaEmail.html b/src/main/resources/templates/mail/encuestaPrivadaEmail.html
index b017e8b..4acd28a 100644
--- a/src/main/resources/templates/mail/encuestaPrivadaEmail.html
+++ b/src/main/resources/templates/mail/encuestaPrivadaEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/encuestaPublicaEmail.html b/src/main/resources/templates/mail/encuestaPublicaEmail.html
index f4a1dda..67a14a9 100644
--- a/src/main/resources/templates/mail/encuestaPublicaEmail.html
+++ b/src/main/resources/templates/mail/encuestaPublicaEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/passwordResetEmail.html b/src/main/resources/templates/mail/passwordResetEmail.html
index 1742a3f..8c6b549 100644
--- a/src/main/resources/templates/mail/passwordResetEmail.html
+++ b/src/main/resources/templates/mail/passwordResetEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/passwordRestoredEmail.html b/src/main/resources/templates/mail/passwordRestoredEmail.html
index 6dcebd1..5374e25 100644
--- a/src/main/resources/templates/mail/passwordRestoredEmail.html
+++ b/src/main/resources/templates/mail/passwordRestoredEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/reactivatedAccountEmail.html b/src/main/resources/templates/mail/reactivatedAccountEmail.html
index 8226a4d..f0b0767 100644
--- a/src/main/resources/templates/mail/reactivatedAccountEmail.html
+++ b/src/main/resources/templates/mail/reactivatedAccountEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/suspendedAccountEmail.html b/src/main/resources/templates/mail/suspendedAccountEmail.html
index 5cc146b..217aedf 100644
--- a/src/main/resources/templates/mail/suspendedAccountEmail.html
+++ b/src/main/resources/templates/mail/suspendedAccountEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/webapp/app/account/settings/settings.component.html b/src/main/webapp/app/account/settings/settings.component.html
index 738b1c0..a840991 100644
--- a/src/main/webapp/app/account/settings/settings.component.html
+++ b/src/main/webapp/app/account/settings/settings.component.html
@@ -1,172 +1,3 @@
-
-
diff --git a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html
index ceb258b..d1ad4e4 100644
--- a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html
+++ b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html
@@ -2,24 +2,25 @@
-
-
+
+
Cambiar estado
Are you sure you want to toggle this category's status?
diff --git a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts
index df89d70..8d665e3 100644
--- a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts
+++ b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts
@@ -10,10 +10,13 @@ import { finalize, map } from 'rxjs/operators';
import { Categoria, ICategoria } from '../categoria.model';
import { CategoriaService } from '../service/categoria.service';
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
@Component({
templateUrl: './categoria-delete-dialog.component.html',
})
export class CategoriaDeleteDialogComponent {
+ faExchangeAlt = faExchangeAlt;
+
categoria?: ICategoria;
encuestas?: IEncuesta[];
encuestasFiltradas?: IEncuesta[];
diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html
index 7fb1898..a268f84 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.html
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html
@@ -64,7 +64,8 @@
Edit
-
diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.ts b/src/main/webapp/app/entities/categoria/list/categoria.component.ts
index 10caf63..869e3c8 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.ts
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.ts
@@ -6,11 +6,15 @@ import { ICategoria } from '../categoria.model';
import { CategoriaService } from '../service/categoria.service';
import { CategoriaDeleteDialogComponent } from '../delete/categoria-delete-dialog.component';
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
+
@Component({
selector: 'jhi-categoria',
templateUrl: './categoria.component.html',
})
export class CategoriaComponent implements OnInit {
+ faExchangeAlt = faExchangeAlt;
+
categorias?: ICategoria[];
isLoading = false;
public searchString: string;
diff --git a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
index 827ff29..0ad506f 100644
--- a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
+++ b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
@@ -46,10 +46,10 @@
type="button"
id="cancel-save"
data-cy="entityCreateCancelButton"
- class="btn btn-secondary ds-btn ds-btn-secondary"
+ class="ds-btn ds-btn--secondary"
(click)="previousState()"
>
-
Cancel
+
Cancel
Save
diff --git a/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html b/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html
index a21389e..8fd4065 100644
--- a/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html
+++ b/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html
@@ -6,9 +6,13 @@
-
-
-
+
Eliminar encuesta
+
Are you sure you want to delete this survey?
diff --git a/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html b/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html
index 40356a0..2845052 100644
--- a/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html
+++ b/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html
@@ -1,24 +1,23 @@
-
-
-
-
Are you sure you want to delete this Encuesta?
+
+
Publicar encuesta
+
+ Are you sure you want to delete this Encuesta?
+
@@ -316,7 +234,8 @@
{{ encuesta.estado }} |
|
@@ -326,7 +245,7 @@
|
-
View
-
+ -->
-
Edit
-
+ -->
@@ -486,268 +405,3 @@
-
-
-
-
diff --git a/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html b/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html
index 612a6f7..6b7f066 100644
--- a/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html
+++ b/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html
@@ -1,17 +1,14 @@
-
-
-
-
+
+
+
La cantidad mínima de los días, debe ser inferior a la cantidad máxima
diff --git a/src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.html b/src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.html
index 9c52edd..e550920 100644
--- a/src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.html
+++ b/src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.html
@@ -1,20 +1,22 @@
-
| -->
-
+ |
-
View
-
-
-
+
+
+
+ Toggle Status
|
diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
index dd5e8f0..7dd0a57 100644
--- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
+++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
@@ -8,12 +8,16 @@ import { UsuarioExtraDeleteDialogComponent } from '../delete/usuario-extra-delet
import { IUser } from '../../user/user.model';
import { finalize } from 'rxjs/operators';
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
+
@Component({
selector: 'jhi-usuario-extra',
templateUrl: './usuario-extra.component.html',
styleUrls: ['./usuario-extra.component.scss'],
})
export class UsuarioExtraComponent implements OnInit {
+ faExchangeAlt = faExchangeAlt;
+
usuarioExtras?: IUsuarioExtra[];
publicUsers?: IUser[];
isLoading = false;
diff --git a/src/main/webapp/app/login/login.component.html b/src/main/webapp/app/login/login.component.html
index 4918e58..836a3c5 100644
--- a/src/main/webapp/app/login/login.component.html
+++ b/src/main/webapp/app/login/login.component.html
@@ -62,7 +62,7 @@
-
+
diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss
index db81bbd..f2f63e5 100644
--- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss
+++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss
@@ -11,6 +11,14 @@
font-size: 1.2rem;
}
+.ds-title--small {
+ color: #313747;
+ font-weight: 900;
+ letter-spacing: 0.025rem;
+ text-transform: uppercase;
+ font-size: 1.1rem;
+}
+
.ds-subtitle {
color: #757d94;
font-size: 0.9rem;
diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-modal.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-modal.scss
index 4330bcd..f784c9f 100644
--- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-modal.scss
+++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-modal.scss
@@ -12,7 +12,7 @@
.modal-header,
.modal-footer {
border: none;
- padding: 2rem;
+ padding: 2rem !important;
display: flex;
align-items: center;
diff --git a/src/main/webapp/content/scss/paper-dashboard/_modals.scss b/src/main/webapp/content/scss/paper-dashboard/_modals.scss
index 669a8a8..0d480a4 100644
--- a/src/main/webapp/content/scss/paper-dashboard/_modals.scss
+++ b/src/main/webapp/content/scss/paper-dashboard/_modals.scss
@@ -1,5 +1,6 @@
.modal-header {
- border-bottom: 1px solid $medium-gray;
+ // border-bottom: 1px solid $medium-gray;
+ border: none !important;
padding: 20px;
text-align: center;
display: block !important;
@@ -41,9 +42,9 @@
}
.modal-content {
- border: 0 none;
- border-radius: 10px;
- box-shadow: 0 0 15px rgba(0, 0, 0, 0.15), 0 0 1px 1px rgba(0, 0, 0, 0.1);
+ border: none !important;
+ border-radius: 3px !important;
+ box-shadow: none !important;
.modal-header {
h6 {
margin-top: 10px;
@@ -59,8 +60,9 @@
color: #000;
}
.modal-footer {
- border-top: 1px solid $medium-gray;
- padding: 0px;
+ // border-top: 1px solid $medium-gray;
+ border: none !important;
+ // padding: 0px;
&.no-border-footer {
border-top: 0 none;
diff --git a/src/main/webapp/i18n/es/usuarioExtra.json b/src/main/webapp/i18n/es/usuarioExtra.json
index 47fc023..1052496 100644
--- a/src/main/webapp/i18n/es/usuarioExtra.json
+++ b/src/main/webapp/i18n/es/usuarioExtra.json
@@ -12,7 +12,7 @@
"updated": "El usuario con el identificador {{ param }} ha sido actualizado",
"deleted": "El usuario con el identificador {{ param }} ha sido eliminado",
"delete": {
- "question": "¿Seguro que quiere modificar el estado del usuario ?"
+ "question": "¿Seguro que quiere cambiar el estado del usuario?"
},
"detail": {
"title": "Usuario"