Browse Source

Se cambiaron los estilos con los nuevos colores de la nueva admnistracion

master
mramirezg 9 months ago
parent
commit
cf602598d6
15 changed files with 194 additions and 19 deletions
  1. BIN
      src/main/bundles/dev.bundle
  2. +179
    -8
      src/main/frontend/themes/sistema-mantenimiento/styles.css
  3. +5
    -1
      src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java
  4. +6
    -2
      src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java
  5. +4
    -8
      src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java
  6. BIN
      src/main/resources/META-INF/resources/images/1027x160.png
  7. BIN
      src/main/resources/META-INF/resources/images/900x160.png
  8. BIN
      src/main/resources/META-INF/resources/images/960x960.png
  9. BIN
      src/main/resources/META-INF/resources/images/LOGO.40ANIV.png
  10. BIN
      src/main/resources/META-INF/resources/images/LOGO_1080X1024.png
  11. BIN
      src/main/resources/META-INF/resources/images/LOGO_24'27.png
  12. BIN
      src/main/resources/META-INF/resources/images/LOGO_900X160.png
  13. BIN
      src/main/resources/META-INF/resources/images/bckgnd.png
  14. BIN
      src/main/resources/META-INF/resources/images/bckgndNvo.png
  15. BIN
      src/main/resources/META-INF/resources/images/logocelaya2124.png

BIN
src/main/bundles/dev.bundle View File


+ 179
- 8
src/main/frontend/themes/sistema-mantenimiento/styles.css View File

@ -5,12 +5,12 @@
/* ----------- Estilos para el MainLayout.java ----------- */
/* Estilos para el DrawerToggle*/
.drawer-toggle {
background-color: #AA86E0;
background-color: #bc955b;
}
/* Estilos para el encabezado */
.header-content {
background-color: #AA86E0;
background-color: #bc955b;
height: 64px;
display: flex;
align-items: center;
@ -19,7 +19,7 @@
/* Estilo para el boton de cerrar sesion */
.logout-button {
margin-right: 50px;
margin-right: 30px;
}
/* Estilos para el drawer */
@ -29,7 +29,10 @@
/* Estilos para el fondo de la aplicacion */
.app-layout {
background-image: url('/images/bckgnd.png');
background-image: url('/images/bckgndNvo.png');
background-size: cover;
background-position: center;
background-repeat: no-repeat;
}
/* ------------------ FIN -------------------------------------- */
/*
@ -40,7 +43,7 @@
/*!--------------------- Estilos para MantenimientosView.java ------------------- */
/* Estilo para el fondo del header */
.plan-anual-header {
background-color: #3E8BEA;
background-color: #a02142;
padding: 0;
}
@ -48,14 +51,14 @@
.plan-anual-titulo {
text-align: center;
font-size: 24px;
color: white;
color: #ddc9a3;
}
/* Estilo para el subtitulo */
.plan-anual-titulo1 {
text-align: center;
font-size: 18px;
color: white;
color: #ddc9a3;
}
/* Estilo para el campo de texto nomenclatura */
@ -92,4 +95,172 @@
.act-diaria-grid {
margin-top: 20px;
}
/* ---------------------------- FIN------------------------ */
/* ---------------------------- FIN------------------------ */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* Estilos especificos para el TextField, TextArea y Fecha*/
vaadin-text-field::part(label), vaadin-text-area::part(label), vaadin-date-picker::part(label) {
color: #691b31; /* Color de la etiqueta */
}
vaadin-text-field::part(input-field), vaadin-text-area::part(input-field), vaadin-password-field::part(input-field),
vaadin-number-field::part(input-field), vaadin-date-picker::part(input-field) {
border: 1px solid #691b31; /* Color del borde */
color: #691b31; /* Color del texto */
}
vaadin-month-calendar::part(date) {
color: #691b31; /* Color para los dias del calendario */
}
vaadin-month-calendar::part(date):hover /* Estilos para cuando se posiciona el puntero sobre el dia */{
background-color: #a02142;
opacity: 50%;
border-radius: 5px;
}
vaadin-month-calendar::part(date focused) {
background-color: #ddc9a3; /* Color de la fecha seleccionada */
}
vaadin-date-picker-overlay-content > vaadin-button, vaadin-date-picker-year::part(year-number) {
color: #691b31;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* Estilos específicos para el Upload */
vaadin-upload > vaadin-button {
color: #691b31;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* Estilos específicos para el ComboBox */
vaadin-combo-box::part(input-field) {
background-color: #ddc9a3; /* Color de fondo */
color: #691b31; /* Color del texto */
border: 1px solid #691b31; /* Color del borde */
}
vaadin-combo-box::part(label) {
color: #691b31; /* Color de las etiquetas */
}
vaadin-combo-box::part(dropdown) {
background-color: rgba(221, 201, 163, 1); /* Color del fondo del dropdown */
}
vaadin-combo-box-item::part(checkmark)::before, vaadin-combo-box-item:hover
{
color: #691b31;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) INDICADOR DE CARGA DE LA APLICACION (*)(*) (*)(*) */
.v-loading-indicator { /* Cambiar el color de la barra de carga que sale cuando la aplicacion esta cargando */
background: #691b31 !important;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) ESTILOS PARA LA SIDEBAR (*)(*) (*)(*) */
vaadin-side-nav-item[aria-current="page"]::part(content) {
color: #691b31; /* Color de texto seleccionado */
}
vaadin-side-nav-item:hover::part(content) {
background-color: #ddc9a3; /* Color de fondo al hacer hover*/
fill-opacity: 50%;
border-radius: 5px;
}
vaadin-side-nav-item::part(content) {
color: #a02142; /* Color del texto deseado */
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/*Estilos especificos para el Grid */
vaadin-grid::part(selected-row-cell) {
background-color: #ddc9a3;
opacity: 100%;
}
vaadin-grid::part(selected-row) {
color: #691b31;
font-weight: bold;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/*Estilos especificos para los botones */
vaadin-button[theme~="primary"] {
background-color: #691b31;
}
vaadin-button:not([theme]) {
color: #bc955b;
}
vaadin-button:hover::before {
color: blue;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/*Estilos especificos para los CheckBox y RadioButtons */
vaadin-checkbox[checked]::part(checkbox) {
background-color: #691b31; /* Cambia el color del CheckBox */
}
vaadin-checkbox-group::part(label), vaadin-radio-group::part(label) {
color: #691b31;
}
vaadin-radio-button[checked]::part(radio) {
background-color: #691b31;
}
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */
/* Estilo especificos para el login form */
vaadin-login-form.special, vaadin-login-form.special::part(container) {
background-color: rgba(105, 27, 49, 0.8);
border-radius: 30px;
}
vaadin-login-form-wrapper {
background-color: rgba(221, 201, 163, 1);
border-radius: 30px;
}
/*letras de los label*/
vaadin-login-form-wrapper ::part(label) {
color: #6f7271;
/*transform: scale(1.2);*/
}
vaadin-login-form vaadin-button[theme~="submit"] {
background-color: #691b31;
}
vaadin-login-form-wrapper::part(form-title) {
color: #691b31;
}
vaadin-login-form-wrapper::part(error-message) {
color: #a02142;
}

+ 5
- 1
src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java View File

@ -65,12 +65,13 @@ public class MainLayout extends AppLayout {
headerLayout.setSpacing(false);
headerLayout.setAlignItems(FlexComponent.Alignment.CENTER);
Image imgLogo = new Image("images/1027x160.png", "Logo");
Image imgLogo = new Image("images/LOGO_900X160.png", "Logo");
imgLogo.addClassName("drawer-logo");
headerLayout.add(imgLogo);
Scroller scroller = new Scroller(createNavigation());
scroller.getStyle().set("background-color", "#691b31");
addToDrawer(headerLayout, scroller, createFooter());
}
@ -81,6 +82,9 @@ public class MainLayout extends AppLayout {
nav.addItem(new SideNavItem("Plan Anual", PlanAnualView.class, VaadinIcon.CALENDAR.create()));
nav.addItem(new SideNavItem("Listado de Actividades", ActDiariaView.class, VaadinIcon.EDIT.create()));
nav.addItem(new SideNavItem("Mantenimiento", MantenimientoView.class, VaadinIcon.WRENCH.create()));
nav.getStyle().set("background-color", "white");
nav.getStyle().set("border-radius", "5px");
nav.getStyle().set("opacity", "0.9");
return nav;
}


+ 6
- 2
src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java View File

@ -33,6 +33,7 @@ import mx.gob.jumapacelaya.models.TiposHardware;
import mx.gob.jumapacelaya.models.TiposMantenimiento;
import mx.gob.jumapacelaya.models.Usuario;
import mx.gob.jumapacelaya.services.DatabaseService;
import mx.gob.jumapacelaya.services.SecurityService;
import mx.gob.jumapacelaya.services.UserService;
import java.time.LocalDate;
@ -45,6 +46,7 @@ import java.util.*;
@CssImport("./themes/sistema-mantenimiento/styles.css")
public class MantenimientoView extends VerticalLayout implements BeforeEnterObserver {
private final SecurityService securityService;
private final VerticalLayout controlsLayout;
private final DatabaseService databaseService;
private final VerticalLayout actualizacionesLayout;
@ -70,13 +72,14 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse
Span userSignSpan = new Span("Nombre Usuario");
public MantenimientoView(UserService userService) {
public MantenimientoView(UserService userService, SecurityService securityService) {
this.databaseService = new DatabaseService();
this.controlsLayout = new VerticalLayout();
this.actualizacionesLayout = new VerticalLayout();
this.etiquetaLayout = new VerticalLayout();
this.firmasLayout = new HorizontalLayout();
this.botonesLayout = new HorizontalLayout();
this.securityService = securityService;
HorizontalLayout fechaLayout = new HorizontalLayout();
//Componentes de texto
@ -400,7 +403,8 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse
smtSignPad.setBackgroundColor(0, 0, 0, 0);
smtSignPad.setPenColor("#000000");
smtSignPad.getElement().getStyle().set("border", "1px solid black");
Span smtSignSpan = new Span("S.M.T. Nombre");
String u = securityService.getAuthenticatedUser();
Span smtSignSpan = new Span(u);
Span tituloSMT = new Span("Responsable de Soporte");
smtSignLayout.setSizeFull();
smtSignLayout.setSpacing(true);


+ 4
- 8
src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java View File

@ -21,7 +21,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
public LoginView(){
//Configuracion de la vista
addClassName("login-rich-content");
addClassName("login");
setSizeFull();
setPadding(false);
setMargin(false);
@ -32,10 +32,6 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
mainLayout.setPadding(false);
mainLayout.setMargin(false);
// Configuración de la imagen
Image logo = new Image("images/1024x768.png", "Logo JUMAPA ISO");
logo.addClassName("login-logo");
// Configuración de i18n para el formulario de login
LoginI18n i18n = LoginI18n.createDefault();
@ -62,7 +58,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
// Crear un contenedor para el formulario
VerticalLayout loginFormContainer = new VerticalLayout();
Image imageLogin = new Image("images/NVO_JUMAPA.png", "Login");
Image imageLogin = new Image("images/LOGO_24'27.png", "Login");
imageLogin.setWidth("300px");
loginFormContainer.add(imageLogin);
loginFormContainer.add(login);
@ -75,9 +71,9 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
// Añadir la imagen y el contenedor del formulario al layout principal
mainLayout.add(loginFormContainer, logo);
mainLayout.add(loginFormContainer);
mainLayout.setFlexGrow(1, loginFormContainer);
mainLayout.setFlexGrow(2, logo);
mainLayout.setFlexGrow(2);
// Añadir el layout principal a la vista
add(mainLayout);


BIN
src/main/resources/META-INF/resources/images/1027x160.png View File

Before After
Width: 1028  |  Height: 161  |  Size: 23 KiB

BIN
src/main/resources/META-INF/resources/images/900x160.png View File

Before After
Width: 901  |  Height: 161  |  Size: 22 KiB

BIN
src/main/resources/META-INF/resources/images/960x960.png View File

Before After
Width: 961  |  Height: 961  |  Size: 49 KiB

BIN
src/main/resources/META-INF/resources/images/LOGO.40ANIV.png View File

Before After
Width: 1092  |  Height: 575  |  Size: 60 KiB

BIN
src/main/resources/META-INF/resources/images/LOGO_1080X1024.png View File

Before After
Width: 1081  |  Height: 1025  |  Size: 110 KiB

BIN
src/main/resources/META-INF/resources/images/LOGO_24'27.png View File

Before After
Width: 861  |  Height: 424  |  Size: 60 KiB

BIN
src/main/resources/META-INF/resources/images/LOGO_900X160.png View File

Before After
Width: 901  |  Height: 161  |  Size: 22 KiB

BIN
src/main/resources/META-INF/resources/images/bckgnd.png View File

Before After
Width: 1922  |  Height: 1282  |  Size: 81 KiB

BIN
src/main/resources/META-INF/resources/images/bckgndNvo.png View File

Before After
Width: 1025  |  Height: 769  |  Size: 97 KiB

BIN
src/main/resources/META-INF/resources/images/logocelaya2124.png View File

Before After
Width: 918  |  Height: 970  |  Size: 63 KiB

Loading…
Cancel
Save