From 44b591f537aae6ebbef0598beab886d38ba8214c Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Fri, 8 Apr 2016 18:23:18 +0200 Subject: [PATCH] Using Spring Boot Dataflow UI graphic theme --- pom.xml | 27 + src/main/webapp/WEB-INF/jsp/exception.jsp | 15 +- .../webapp/WEB-INF/jsp/fragments/footer.jsp | 7 - .../WEB-INF/jsp/fragments/htmlHeader.jsp | 9 +- .../jsp/owners/createOrUpdateOwnerForm.jsp | 51 +- .../webapp/WEB-INF/jsp/owners/findOwners.jsp | 42 +- .../WEB-INF/jsp/owners/ownerDetails.jsp | 167 +- .../webapp/WEB-INF/jsp/owners/ownersList.jsp | 50 +- .../jsp/pets/createOrUpdatePetForm.jsp | 69 +- .../jsp/pets/createOrUpdateVisitForm.jsp | 97 +- src/main/webapp/WEB-INF/jsp/vets/vetList.jsp | 56 +- src/main/webapp/WEB-INF/jsp/welcome.jsp | 16 +- src/main/webapp/WEB-INF/tags/bodyHeader.tag | 13 +- src/main/webapp/WEB-INF/tags/menu.tag | 9 +- src/main/webapp/WEB-INF/tags/pivotal.tag | 10 + src/main/webapp/resources/css/petclinic.css | 5 + .../resources/fonts/montserrat-webfont.eot | Bin 0 -> 20979 bytes .../resources/fonts/montserrat-webfont.svg | 1283 +++ .../resources/fonts/montserrat-webfont.ttf | Bin 0 -> 42692 bytes .../resources/fonts/montserrat-webfont.woff | Bin 0 -> 24240 bytes .../resources/fonts/varela_round-webfont.eot | Bin 0 -> 28963 bytes .../resources/fonts/varela_round-webfont.svg | 7875 +++++++++++++++++ .../resources/fonts/varela_round-webfont.ttf | Bin 0 -> 63044 bytes .../resources/fonts/varela_round-webfont.woff | Bin 0 -> 32712 bytes .../resources/images/banner-graphic.png | Bin 13773 -> 0 bytes .../webapp/resources/images/bullet-arrow.png | Bin 2954 -> 0 bytes src/main/webapp/resources/images/pets.png | Bin 55318 -> 67721 bytes .../webapp/resources/images/platform-bg.png | Bin 0 -> 9162 bytes .../images/spring-logo-dataflow-mobile.png | Bin 0 -> 3705 bytes .../resources/images/spring-logo-dataflow.png | Bin 0 -> 6888 bytes .../resources/images/springsource-logo.png | Bin 4974 -> 0 bytes .../webapp/resources/images/submit-bg.png | Bin 2820 -> 0 bytes src/main/webapp/resources/less/header.less | 73 + src/main/webapp/resources/less/petclinic.less | 252 + .../webapp/resources/less/responsive.less | 41 + .../webapp/resources/less/typography.less | 60 + .../bootstrap/dist/css/bootstrap-theme.css | 587 -- .../dist/css/bootstrap-theme.css.map | 1 - .../dist/css/bootstrap-theme.min.css | 6 - .../dist/css/bootstrap-theme.min.css.map | 1 - .../vendors/bootstrap/dist/css/bootstrap.css | 6760 -------------- .../bootstrap/dist/css/bootstrap.css.map | 1 - .../bootstrap/dist/css/bootstrap.min.css | 6 - .../bootstrap/dist/css/bootstrap.min.css.map | 1 - .../vendors/bootstrap/less/.csscomb.json | 304 + .../webapp/vendors/bootstrap/less/.csslintrc | 19 + .../webapp/vendors/bootstrap/less/alerts.less | 73 + .../webapp/vendors/bootstrap/less/badges.less | 66 + .../vendors/bootstrap/less/bootstrap.less | 56 + .../vendors/bootstrap/less/breadcrumbs.less | 26 + .../vendors/bootstrap/less/button-groups.less | 244 + .../vendors/bootstrap/less/buttons.less | 166 + .../vendors/bootstrap/less/carousel.less | 270 + .../webapp/vendors/bootstrap/less/close.less | 34 + .../webapp/vendors/bootstrap/less/code.less | 69 + .../bootstrap/less/component-animations.less | 33 + .../vendors/bootstrap/less/dropdowns.less | 216 + .../webapp/vendors/bootstrap/less/forms.less | 613 ++ .../vendors/bootstrap/less/glyphicons.less | 305 + .../webapp/vendors/bootstrap/less/grid.less | 84 + .../vendors/bootstrap/less/input-groups.less | 171 + .../vendors/bootstrap/less/jumbotron.less | 54 + .../webapp/vendors/bootstrap/less/labels.less | 64 + .../vendors/bootstrap/less/list-group.less | 130 + .../webapp/vendors/bootstrap/less/media.less | 66 + .../webapp/vendors/bootstrap/less/mixins.less | 40 + .../vendors/bootstrap/less/mixins/alerts.less | 14 + .../less/mixins/background-variant.less | 9 + .../bootstrap/less/mixins/border-radius.less | 18 + .../bootstrap/less/mixins/buttons.less | 65 + .../bootstrap/less/mixins/center-block.less | 7 + .../bootstrap/less/mixins/clearfix.less | 22 + .../vendors/bootstrap/less/mixins/forms.less | 85 + .../bootstrap/less/mixins/gradients.less | 59 + .../bootstrap/less/mixins/grid-framework.less | 91 + .../vendors/bootstrap/less/mixins/grid.less | 122 + .../bootstrap/less/mixins/hide-text.less | 21 + .../vendors/bootstrap/less/mixins/image.less | 33 + .../vendors/bootstrap/less/mixins/labels.less | 12 + .../bootstrap/less/mixins/list-group.less | 30 + .../bootstrap/less/mixins/nav-divider.less | 10 + .../less/mixins/nav-vertical-align.less | 9 + .../bootstrap/less/mixins/opacity.less | 8 + .../bootstrap/less/mixins/pagination.less | 24 + .../vendors/bootstrap/less/mixins/panels.less | 24 + .../bootstrap/less/mixins/progress-bar.less | 10 + .../bootstrap/less/mixins/reset-filter.less | 8 + .../bootstrap/less/mixins/reset-text.less | 18 + .../vendors/bootstrap/less/mixins/resize.less | 6 + .../less/mixins/responsive-visibility.less | 15 + .../vendors/bootstrap/less/mixins/size.less | 10 + .../bootstrap/less/mixins/tab-focus.less | 9 + .../bootstrap/less/mixins/table-row.less | 28 + .../bootstrap/less/mixins/text-emphasis.less | 9 + .../bootstrap/less/mixins/text-overflow.less | 8 + .../less/mixins/vendor-prefixes.less | 227 + .../webapp/vendors/bootstrap/less/modals.less | 150 + .../webapp/vendors/bootstrap/less/navbar.less | 660 ++ .../webapp/vendors/bootstrap/less/navs.less | 242 + .../vendors/bootstrap/less/normalize.less | 424 + .../webapp/vendors/bootstrap/less/pager.less | 54 + .../vendors/bootstrap/less/pagination.less | 89 + .../webapp/vendors/bootstrap/less/panels.less | 271 + .../vendors/bootstrap/less/popovers.less | 131 + .../webapp/vendors/bootstrap/less/print.less | 101 + .../vendors/bootstrap/less/progress-bars.less | 87 + .../bootstrap/less/responsive-embed.less | 35 + .../bootstrap/less/responsive-utilities.less | 194 + .../vendors/bootstrap/less/scaffolding.less | 161 + .../webapp/vendors/bootstrap/less/tables.less | 234 + .../webapp/vendors/bootstrap/less/theme.less | 291 + .../vendors/bootstrap/less/thumbnails.less | 36 + .../vendors/bootstrap/less/tooltip.less | 101 + .../webapp/vendors/bootstrap/less/type.less | 302 + .../vendors/bootstrap/less/utilities.less | 55 + .../vendors/bootstrap/less/variables.less | 869 ++ .../webapp/vendors/bootstrap/less/wells.less | 29 + 117 files changed, 18560 insertions(+), 7660 deletions(-) create mode 100644 src/main/webapp/WEB-INF/tags/pivotal.tag create mode 100644 src/main/webapp/resources/fonts/montserrat-webfont.eot create mode 100644 src/main/webapp/resources/fonts/montserrat-webfont.svg create mode 100644 src/main/webapp/resources/fonts/montserrat-webfont.ttf create mode 100644 src/main/webapp/resources/fonts/montserrat-webfont.woff create mode 100644 src/main/webapp/resources/fonts/varela_round-webfont.eot create mode 100644 src/main/webapp/resources/fonts/varela_round-webfont.svg create mode 100644 src/main/webapp/resources/fonts/varela_round-webfont.ttf create mode 100644 src/main/webapp/resources/fonts/varela_round-webfont.woff delete mode 100644 src/main/webapp/resources/images/banner-graphic.png delete mode 100644 src/main/webapp/resources/images/bullet-arrow.png create mode 100644 src/main/webapp/resources/images/platform-bg.png create mode 100644 src/main/webapp/resources/images/spring-logo-dataflow-mobile.png create mode 100644 src/main/webapp/resources/images/spring-logo-dataflow.png delete mode 100644 src/main/webapp/resources/images/springsource-logo.png delete mode 100644 src/main/webapp/resources/images/submit-bg.png create mode 100644 src/main/webapp/resources/less/header.less create mode 100644 src/main/webapp/resources/less/petclinic.less create mode 100644 src/main/webapp/resources/less/responsive.less create mode 100644 src/main/webapp/resources/less/typography.less delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap-theme.css delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap-theme.css.map delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap-theme.min.css delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap-theme.min.css.map delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap.css delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap.css.map delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap.min.css delete mode 100644 src/main/webapp/vendors/bootstrap/dist/css/bootstrap.min.css.map create mode 100644 src/main/webapp/vendors/bootstrap/less/.csscomb.json create mode 100644 src/main/webapp/vendors/bootstrap/less/.csslintrc create mode 100644 src/main/webapp/vendors/bootstrap/less/alerts.less create mode 100644 src/main/webapp/vendors/bootstrap/less/badges.less create mode 100644 src/main/webapp/vendors/bootstrap/less/bootstrap.less create mode 100644 src/main/webapp/vendors/bootstrap/less/breadcrumbs.less create mode 100644 src/main/webapp/vendors/bootstrap/less/button-groups.less create mode 100644 src/main/webapp/vendors/bootstrap/less/buttons.less create mode 100644 src/main/webapp/vendors/bootstrap/less/carousel.less create mode 100644 src/main/webapp/vendors/bootstrap/less/close.less create mode 100644 src/main/webapp/vendors/bootstrap/less/code.less create mode 100644 src/main/webapp/vendors/bootstrap/less/component-animations.less create mode 100644 src/main/webapp/vendors/bootstrap/less/dropdowns.less create mode 100644 src/main/webapp/vendors/bootstrap/less/forms.less create mode 100644 src/main/webapp/vendors/bootstrap/less/glyphicons.less create mode 100644 src/main/webapp/vendors/bootstrap/less/grid.less create mode 100644 src/main/webapp/vendors/bootstrap/less/input-groups.less create mode 100644 src/main/webapp/vendors/bootstrap/less/jumbotron.less create mode 100644 src/main/webapp/vendors/bootstrap/less/labels.less create mode 100644 src/main/webapp/vendors/bootstrap/less/list-group.less create mode 100644 src/main/webapp/vendors/bootstrap/less/media.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/alerts.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/background-variant.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/border-radius.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/buttons.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/center-block.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/clearfix.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/forms.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/gradients.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/grid-framework.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/grid.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/hide-text.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/image.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/labels.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/list-group.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/nav-divider.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/nav-vertical-align.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/opacity.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/pagination.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/panels.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/progress-bar.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/reset-filter.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/reset-text.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/resize.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/responsive-visibility.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/size.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/tab-focus.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/table-row.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/text-emphasis.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/text-overflow.less create mode 100644 src/main/webapp/vendors/bootstrap/less/mixins/vendor-prefixes.less create mode 100644 src/main/webapp/vendors/bootstrap/less/modals.less create mode 100644 src/main/webapp/vendors/bootstrap/less/navbar.less create mode 100644 src/main/webapp/vendors/bootstrap/less/navs.less create mode 100644 src/main/webapp/vendors/bootstrap/less/normalize.less create mode 100644 src/main/webapp/vendors/bootstrap/less/pager.less create mode 100644 src/main/webapp/vendors/bootstrap/less/pagination.less create mode 100644 src/main/webapp/vendors/bootstrap/less/panels.less create mode 100644 src/main/webapp/vendors/bootstrap/less/popovers.less create mode 100644 src/main/webapp/vendors/bootstrap/less/print.less create mode 100644 src/main/webapp/vendors/bootstrap/less/progress-bars.less create mode 100644 src/main/webapp/vendors/bootstrap/less/responsive-embed.less create mode 100644 src/main/webapp/vendors/bootstrap/less/responsive-utilities.less create mode 100644 src/main/webapp/vendors/bootstrap/less/scaffolding.less create mode 100644 src/main/webapp/vendors/bootstrap/less/tables.less create mode 100644 src/main/webapp/vendors/bootstrap/less/theme.less create mode 100644 src/main/webapp/vendors/bootstrap/less/thumbnails.less create mode 100644 src/main/webapp/vendors/bootstrap/less/tooltip.less create mode 100644 src/main/webapp/vendors/bootstrap/less/type.less create mode 100644 src/main/webapp/vendors/bootstrap/less/utilities.less create mode 100644 src/main/webapp/vendors/bootstrap/less/variables.less create mode 100644 src/main/webapp/vendors/bootstrap/less/wells.less diff --git a/pom.xml b/pom.xml index 78d27ba13..13040a701 100644 --- a/pom.xml +++ b/pom.xml @@ -427,6 +427,33 @@ + + less-install + + + + org.lesscss + lesscss-maven-plugin + 1.7.0.1.1 + + ${project.basedir}/src/main/webapp/resources/less + ${project.basedir}/src/main/webapp/resources/css + true + + petclinic.less + + + + + + compile + + + + + + + demopetclinic diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/src/main/webapp/WEB-INF/jsp/exception.jsp index 8a0a4c9bf..a4fde6ca3 100644 --- a/src/main/webapp/WEB-INF/jsp/exception.jsp +++ b/src/main/webapp/WEB-INF/jsp/exception.jsp @@ -10,20 +10,23 @@ -
+
+
- - + + -

Something happened...

+

Something happened...

-

${exception.message}

+

${exception.message}

- + +
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp index e499b2682..6029efb58 100644 --- a/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp +++ b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp @@ -1,12 +1,5 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -
-
-
" - alt="Sponsored by Pivotal"/>
-
-
- <%-- Placed at the end of the document so the pages load faster --%> diff --git a/src/main/webapp/WEB-INF/jsp/fragments/htmlHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/htmlHeader.jsp index eea7b8231..a51e56dac 100644 --- a/src/main/webapp/WEB-INF/jsp/fragments/htmlHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/fragments/htmlHeader.jsp @@ -16,14 +16,7 @@ PetClinic :: a Spring Framework demonstration PetClinic :: a Spring Framework demonstration - <%-- Bootstrap CSS --%> - - - - - - - <%-- Custom styles for Petclinic --%> + <%-- CSS generated from LESS --%> diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp index b18a88fed..77826de8a 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp @@ -15,31 +15,34 @@ -
-

- New Owner -

- -
- - - - - -
-
-
- - - - - - - - +
+
+

+ New Owner +

+ +
+ + + + +
-
- +
+
+ + + + + + + + +
+
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp index 15b82afac..e9f9b9061 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp @@ -13,32 +13,36 @@ -
+
+
-

Find Owners

+

Find Owners

- - -
-
- -
- - + + +
+
+ +
+ + +
-
-
-
- +
+
+ +
-
- + -
- Add Owner +
+ Add Owner + + +
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp index 14981958f..54eade30a 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp @@ -14,94 +14,99 @@ -
+
+
-

Owner Information

+

Owner Information

- - - - - - - - - - - - - - - - - -
Name
Address
City
Telephone
- - - - - Edit Owner - - - - - Add New Pet - - -

Pets and Visits

- - - - +
- - + + + + + + + + + + + + + + +
-
-
Name
-
-
Birth Date
-
-
Type
-
-
-
- - - - - - - - - - - - - - - - - -
Visit DateDescription
- - - - - Edit Pet - - - - - - Add Visit -
-
Name
Address
City
Telephone
- - + + + + Edit Owner + + + + Add New Pet + +
+
+
+

Pets and Visits

+ + + + + + + + + + +
+
+
Name
+
+
Birth Date
+
+
Type
+
+
+
+ + + + + + + + + + + + + + + + + +
Visit DateDescription
+ + + + + Edit Pet + + + + + + Add Visit +
+
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp index f2fb639c4..1824a288c 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp @@ -14,30 +14,34 @@ -
-

Owners

+
+
+

Owners

- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp index 5bd1667c3..e4f20e9ff 100644 --- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp @@ -13,43 +13,46 @@ -
-

- New Pet -

- - -
-
- -
- +
+
+

+ New Pet +

+ + +
+
+ +
+ +
+
+ + +
+
- - -
- +
+
+ + + + + + + + +
-
-
-
- - - - - - - - -
-
-
- - -
+ + + + +
+