Merge branch 'feature/redesign2' into develop

static/css/styles2.css

@@ -75,7 +75,8 @@
         font-weight: bold;
         text-align: left;
         font-size: 1.4em;
-        color: #dddddd;
+        /* color: #dddddd; */
+        color: #f8f8ff;
         padding: 15px;
     }
 
@@ -83,7 +84,8 @@
         font-weight: bold;
         text-align: left;
         font-size: 1.0em;
-        color: #dddddd;
+        color: #f8f8ff;
+/*        color: #dddddd; */
     }
 
 
@@ -120,7 +122,8 @@
     aside ul ul ul a {
         list-style: none;
         margin: 0;
-        background: #35383d;   
+        background: #144f80;
+/*        background: #35383d;   */
     }
 
 
@@ -130,7 +133,8 @@
     aside ul ul a:hover,
     aside ul ul ul label:hover,
     aside ul ul ul a:hover {
-        background: #4d5158; 
+        /*        background: #4d5158;  */
+        background: #1c75bc;
     }
 
 
@@ -146,7 +150,8 @@
     aside .cd-accordion-menu {
         width: 100%;
         max-width: 600px;        
-        background: #35383d;   
+        /*        background: #35383d;   */
+        background: #144f80;
     }
     
     aside .cd-accordion-menu ul {
@@ -171,7 +176,8 @@
     aside .cd-accordion-menu a {
         position: relative;
         display: block;
-        color: #dddddd;
+        color: #f8f8ff;
+        /*         color: #dddddd; */
         font-size: 1.0em; 
     }
 
@@ -359,14 +365,16 @@
     
 .main-head {
     grid-area: header;
-    background: #ededed;
+    /*    background: #ededed; */
+    background: #f8f8ff;
 }
 
 
 
 .main-user {
     grid-area: user;
-    background: #ededed;
+/*    background: #ededed; */
+    background: #f8f8ff;
 }
 
 .content {
@@ -396,30 +404,38 @@
 
 .main-nav {
     grid-area: nav;
-    background: #1c75bc;
+    /* background: #1c75bc; */
+    background: #1c75bc; 
+    /* background: #144f80; */
 }
 
 .side-nav {
     grid-area: side-nav;
-    background: #1c75bc;
+    background: #1c75bc; 
+    /*    background: #144f80; */
+    /* background: #1c75bc; */
 }    
 
 .side {
   grid-area: sidebar;
-  background: #35383d;
+  /*  background: #35383d; */
+  background: #144f80;
   /* border-top: 1px solid #dddddd; */
   padding: 0;
 }
 
 .sideheader {
     grid-area: side-header;
-   color: #dddddd;
-    background: #35383d;
+    color: #f8f8ff;
+    /* color: #dddddd; */
+  background: #144f80;
+/*    background: #35383d; */
     padding: 0;
 }
 
 .side h2 {
-    color: #dddddd;
+        color: #f8f8ff;
+        /*     color: #dddddd; */
     font-weight: bold;
     text-align: left;
     font-size: 1.0em;
@@ -433,7 +449,8 @@
     font-weight: bold;
     text-align: left;
     font-size: 1.4em;
-    color: #dddddd;
+    color: #f8f8ff;
+    /* color: #dddddd; */
     padding: 5px;
     margin: 0;
     margin-left: 30px;
@@ -442,7 +459,8 @@
 
 .ad {
   grid-area: ad;
-  background: #35383d;
+  background: #144f80;
+  /* background: #35383d; */
   color: #dddddd;
   padding: 1em 1em 1em 1em;
 }
@@ -461,7 +479,8 @@
 
 .main-footer {
   grid-area: footer;
-  background: #ededed;
+  /* background: #ededed; */
+  background: #f8f8ff;
   padding:  1.2em 1.2em 1.2em 1.2em;
 }
 

templates/newbase.html

@@ -131,7 +131,7 @@
           <li>
             <a href="/" title="Home">
               <img src="/static/img/logo7.png"
-                   alt="Rowsandall logo" width="200px">
+                   alt="Rowsandall logo" width="250px">
             </a>
           </li>
           <li>