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 000000000..a8a181eb8 Binary files /dev/null and b/src/main/resources/static/resources/images/Logo Cheapy.png differ diff --git a/src/main/resources/static/resources/images/Logo Cheapy2.png b/src/main/resources/static/resources/images/Logo Cheapy2.png new file mode 100644 index 000000000..db61ed652 Binary files /dev/null and b/src/main/resources/static/resources/images/Logo Cheapy2.png differ diff --git a/src/main/resources/static/resources/images/Logo Cheapy2Negro.png b/src/main/resources/static/resources/images/Logo Cheapy2Negro.png new file mode 100644 index 000000000..13c3b6860 Binary files /dev/null and b/src/main/resources/static/resources/images/Logo Cheapy2Negro.png differ diff --git a/src/main/resources/static/resources/images/eslogan.png b/src/main/resources/static/resources/images/eslogan.png new file mode 100644 index 000000000..d7fae9ce0 Binary files /dev/null and b/src/main/resources/static/resources/images/eslogan.png differ diff --git a/src/main/resources/static/resources/images/favicon.png b/src/main/resources/static/resources/images/favicon.png index 1c649a3cd..8c9fea647 100644 Binary files a/src/main/resources/static/resources/images/favicon.png and b/src/main/resources/static/resources/images/favicon.png differ diff --git a/src/main/resources/static/resources/images/faviconChikito.png b/src/main/resources/static/resources/images/faviconChikito.png new file mode 100644 index 000000000..359d16ba3 Binary files /dev/null and b/src/main/resources/static/resources/images/faviconChikito.png differ diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 8d15b5044..e9c105d35 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -5,11 +5,16 @@ -

+

- - +
+ + +
+
+ +
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"/>