diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index e8a02ef7..5fade5f7 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -150,8 +150,15 @@ background-color: #253660; z-index: 100; } -#footer{ - z-index: 1; +#wrapper{ + height: auto; + min-height: 100%; + padding-bottom: 100px; +} +footer{ + height: 100px; + position : relative; + transform : translateY(-100%); } .bg-label{ background-color: lightblue; diff --git a/src/main/resources/static/img/logoNew.png b/src/main/resources/static/img/logoNew.png new file mode 100644 index 00000000..8dda7a05 Binary files /dev/null and b/src/main/resources/static/img/logoNew.png differ diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 53a87390..aa4083e4 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,20 +1,20 @@ - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 1f89d56b..737f9523 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -6,9 +6,7 @@
diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index 85cc24c0..123eca29 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -1,11 +1,13 @@
-
- +
-
    +
    • diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html index 96a66c89..574f95c7 100644 --- a/src/main/resources/templates/layout/layout.html +++ b/src/main/resources/templates/layout/layout.html @@ -46,7 +46,7 @@ - +
      -
      +
      -
      @@ -84,8 +83,10 @@
      +
      -
      +
      +