From 0f933acd526cf329c5981189ae2d6f80866c8ff3 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 23 Mar 2021 12:55:11 +0100 Subject: [PATCH] Primeros cambios en las vistas --- src/main/less/header.less | 18 +++--- src/main/less/petclinic.less | 53 +++++++++++++++--- .../resources/messages/messages_es.properties | 2 +- .../static/resources/images/Logo Cheapy.png | Bin 0 -> 13578 bytes .../static/resources/images/Logo Cheapy2.png | Bin 0 -> 3666 bytes .../resources/images/Logo Cheapy2Negro.png | Bin 0 -> 20838 bytes .../static/resources/images/eslogan.png | Bin 0 -> 5305 bytes .../static/resources/images/favicon.png | Bin 528 -> 15842 bytes .../resources/images/faviconChikito.png | Bin 0 -> 2180 bytes src/main/webapp/WEB-INF/jsp/welcome.jsp | 11 +++- src/main/webapp/WEB-INF/tags/htmlHeader.tag | 4 +- src/main/webapp/WEB-INF/tags/menu.tag | 21 +++---- src/main/webapp/WEB-INF/tags/pivotal.tag | 2 +- 13 files changed, 73 insertions(+), 38 deletions(-) create mode 100644 src/main/resources/static/resources/images/Logo Cheapy.png create mode 100644 src/main/resources/static/resources/images/Logo Cheapy2.png create mode 100644 src/main/resources/static/resources/images/Logo Cheapy2Negro.png create mode 100644 src/main/resources/static/resources/images/eslogan.png create mode 100644 src/main/resources/static/resources/images/faviconChikito.png diff --git a/src/main/less/header.less b/src/main/less/header.less index 7cb1a7888..a9e394b89 100644 --- a/src/main/less/header.less +++ b/src/main/less/header.less @@ -1,6 +1,6 @@ .navbar { - border-top: 4px solid #6db33f; - background-color: #34302d; + border-top: 4px solid rgb(0, 64, 128); + background-color: rgb(40, 140, 215); margin-bottom: 0px; border-bottom: 0; border-left: 0; @@ -8,20 +8,20 @@ } .navbar a.navbar-brand { - background: url("../images/spring-logo-dataflow.png") -1px -1px no-repeat; + background: url("../images/Logo Cheapy2.png") -1px -1px no-repeat; margin: 12px 0 6px; - width: 229px; - height: 46px; + width: 55px; + height: 55px; display: inline-block; text-decoration: none; padding: 0; } .navbar a.navbar-brand span { - display: block; - width: 229px; - height: 46px; - background: url("../images/spring-logo-dataflow.png") -1px -48px no-repeat; + display: inline-block; + width: 55px; + height: 55px; + background: url("../images/Logo Cheapy2Negro.png") -1px -1px no-repeat; opacity: 0; -moz-transition: opacity 0.12s ease-in-out; -webkit-transition: opacity 0.12s ease-in-out; diff --git a/src/main/less/petclinic.less b/src/main/less/petclinic.less index 7c88ec091..775c4b0aa 100644 --- a/src/main/less/petclinic.less +++ b/src/main/less/petclinic.less @@ -13,24 +13,24 @@ */ @icon-font-path: "../../webjars/bootstrap/fonts/"; -@spring-green: #6db33f; -@spring-dark-green: #5fa134; +@spring-blue: rgb(0, 64, 128); +@spring-dark-blue: rgb(0, 0, 128); @spring-brown: #34302D; @spring-grey: #838789; @spring-light-grey: #f1f1f1; @body-bg: @spring-light-grey; @text-color: @spring-brown; -@link-color: @spring-dark-green; -@link-hover-color: @spring-dark-green; +@link-color: @spring-dark-blue; +@link-hover-color: @spring-dark-blue; @navbar-default-link-color: @spring-light-grey; @navbar-default-link-active-color: @spring-light-grey; @navbar-default-link-hover-color: @spring-light-grey; -@navbar-default-link-hover-bg: @spring-green; +@navbar-default-link-hover-bg: @spring-blue; @navbar-default-toggle-icon-bar-bg: @spring-light-grey; @navbar-default-toggle-hover-bg: transparent; -@navbar-default-link-active-bg: @spring-green; +@navbar-default-link-active-bg: @spring-blue; @border-radius-base: 0; @border-radius-large: 0; @@ -38,7 +38,7 @@ @btn-default-color: @spring-light-grey; @btn-default-bg: @spring-brown; -@btn-default-border: @spring-green; +@btn-default-border: @spring-blue; @nav-tabs-active-link-hover-color: @spring-light-grey; @nav-tabs-active-link-hover-bg: @spring-brown; @@ -46,7 +46,7 @@ @nav-tabs-border-color: @spring-brown; @pagination-active-bg: @spring-brown; -@pagination-active-border: @spring-green; +@pagination-active-border: @spring-blue; @table-border-color: @spring-brown; .table > thead > tr > th { @@ -125,7 +125,7 @@ h1 { } .splash { - background: @spring-green; + background: @spring-blue; color: @spring-brown; display: none; } @@ -204,6 +204,41 @@ table td.action-column { color: @spring-brown; } +img.img-responsive{ + display: block; + margin-left: auto; + margin-right: auto +} + +.img-home{ + display: table; + margin: 0 auto; +} + +.btn-home{ + display: table; + margin: 0 auto; +} + +.btn-home button { + background-color: rgb(0, 64, 128); /* Green background */ + border: 1px solid rgb(0, 0, 160); + color: white; + padding: 10px 24px; + cursor: pointer; + width: 100%; + display: block; +} + +.btn-home button:not(:last-child) { + border-bottom: none; +} + + +.btn-home button:hover { + background-color: rgb(0, 64, 128); +} + .alert-success { .alert-variant(fade(@alert-success-bg, 70%); @alert-success-border; @alert-success-text); } diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties index 33ee867b5..bdf81dae7 100644 --- a/src/main/resources/messages/messages_es.properties +++ b/src/main/resources/messages/messages_es.properties @@ -1,4 +1,4 @@ -welcome=Bienvenido +welcome=Bienvenido a required=Es requerido notFound=No ha sido encontrado duplicate=Ya se encuentra en uso diff --git a/src/main/resources/static/resources/images/Logo Cheapy.png b/src/main/resources/static/resources/images/Logo Cheapy.png new file mode 100644 index 0000000000000000000000000000000000000000..a8a181eb871d38408e59f74b3d05f1ed97ca429f GIT binary patch literal 13578 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 -

+

- - +
+ + +
+
+ +
diff --git a/src/main/webapp/WEB-INF/tags/htmlHeader.tag b/src/main/webapp/WEB-INF/tags/htmlHeader.tag index 79f7feeb9..2417673ea 100644 --- a/src/main/webapp/WEB-INF/tags/htmlHeader.tag +++ b/src/main/webapp/WEB-INF/tags/htmlHeader.tag @@ -11,10 +11,10 @@ PetClinic :: a Spring Framework demonstration <%-- The above 4 meta tags *must* come first in the head; any other head content must come *after* these tags --%> - + - PetClinic :: a Spring Framework demonstration + Cheapy : eat fast, eat cheapy <%-- CSS generated from LESS --%> diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index ad7f36319..b3a7c589e 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -28,22 +28,17 @@ Home - - - Find owners - - - + - Veterinarians + Contáctanos - - - Error + + + + Login diff --git a/src/main/webapp/WEB-INF/tags/pivotal.tag b/src/main/webapp/WEB-INF/tags/pivotal.tag index 8ee35fb1f..23991e12a 100644 --- a/src/main/webapp/WEB-INF/tags/pivotal.tag +++ b/src/main/webapp/WEB-INF/tags/pivotal.tag @@ -4,7 +4,7 @@
-
" +
" alt="Sponsored by Pivotal"/>