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

Conflicts: wise-webapp/src/main/webapp/jsp/mindmapList.jsp
2014-02-14 03:54:36 -03:00
parent e9ca68732e 1c530a0460
commit fbea000aad
10 changed files with 126 additions and 96 deletions
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -125,4 +125,9 @@ div#headerActions {

 div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
    color: white;
-}
+}
+
+#dialogMainForm label
+{
+    font-weight:normal;
+}
--- a/wise-webapp/src/main/webapp/css/pageTemplate.css
+++ b/wise-webapp/src/main/webapp/css/pageTemplate.css
@@ -55,8 +55,6 @@ div#pageContainer {
 }

 #loginPanel h1 {
-    color: #ffffff;
+    color: #00008b;
 }

-
-