sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'feature/redesign2' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2018-11-20 21:04:58 +01:00
parent a02ef7233e 95bf1acb0e
commit cdeac38129
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
static/css/styles2.css
View File

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

2
templates/newbase.html
View File

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