Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport

Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp

wise-webapp/src/main/webapp/css/mindmapList.less

@@ -338,7 +338,7 @@ abbr[title] {
 }
 
 #foldersContainer {
-    padding-top: 60px;
+    padding-top: 86px;
 }
 
 #footerContainer > ul {

wise-webapp/src/main/webapp/css/pageHeaders.css

@@ -57,6 +57,7 @@ html,body {
     padding-left: 7px;
     font-weight: bold;
     vertical-align: middle;
+    font-size: 20px;
 }
 
 #headerButtons {
@@ -124,4 +125,4 @@ div#headerActions {
 
 div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
     color: white;
-}
+}

wise-webapp/src/main/webapp/css/pageTemplate.css

@@ -2,7 +2,7 @@
 @import "pageHeaders.css";
 
 div#register {
-    margin: 40px auto;
+    margin: 20px auto;
     text-align: center;
     white-space: nowrap;
 }
@@ -17,34 +17,6 @@ div#pageContainer {
     min-height: 100%;
 }
 
-div.bodyContainer {
-    padding-top: 30px;
-    padding-bottom: 85px; /* Height of the footer */
-}
-
-div.bodyContainer h1 {
-    color: #093A9D;
-    font-size: 150%;
-    margin-bottom: 5px;
-    font-weight: bold;
-}
-
-div.bodyContainer h2 {
-    color: gray;
-    font-size: 150%;
-    border-bottom: 1px dashed #BBB4D6;
-    margin: 20px 0;
-}
-
-div.bodyContainer ul {
-    padding: 5px;
-}
-
-div.bodyContainer li {
-    list-style-type: disc;
-    margin-left: 12px;
-}
-
 #footerContainer {
     padding-top: 10px;
     border-top: 1px black solid;
@@ -58,21 +30,33 @@ div.bodyContainer li {
 
 /*--   End Main Page Style -- */
 
-span.errorMsg {
-    color: red;
+
+/* Reduce styles */
+.jumbotron > h1 {
+    font-size: 30px;
+    color: #00008b;
 }
 
-div.fform {
-    background: #eeeeee;
-    border: 1px solid #cfcfcf;
-    padding: 5px 25px;
-    -moz-border-radius: 8px;
-    -khtml-border-radius: 8px;
-    -webkit-border-radius: 8px;
-    border-radius: 8px;
+.jumbotron  p {
+    font-size: 15px;
 }
 
-div.fform label {
-    font-weight: bold;
+#login h1 {
+    font-size: 25px;
+    color: #00008b;
 }
 
+#loginPanel {
+    padding: 0 60px;
+    background: #ffffff;
+    margin-top: 40px;
+    background: #F7C931;
+    color: #ffffff;
+}
+
+#loginPanel h1 {
+    color: #ffffff;
+}
+
+
+