diff options
| author | Erling Aaby <spa440w@gmail.com> | 2013-04-24 11:27:15 +0200 |
|---|---|---|
| committer | Erling Aaby <spa440w@gmail.com> | 2013-04-24 11:27:26 +0200 |
| commit | dfced8ca98d05906ad343a6b6b3653cb3e25f509 (patch) | |
| tree | 4bfda53d3fa1e52ffb2dedaf9c00fa449c6b552f | |
| parent | facebook now somewhat works (diff) | |
| download | Divid-dfced8ca98d05906ad343a6b6b3653cb3e25f509.tar.gz | |
Revert "Various navbar and infobox changes"
This reverts commit 57e0f712b5acc48c79f817b9973f4036a73f0728.
Diffstat (limited to '')
| -rw-r--r-- | public/css/styles.less | 6 | ||||
| -rw-r--r-- | views/navbar.ejs | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/public/css/styles.less b/public/css/styles.less index 56eef48..1cad347 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -50,7 +50,7 @@ section.content { #vertical(rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.9), rgba(red(@top-navbar-bgColor),green(@top-navbar-bgColor),blue(@top-navbar-bgColor),0.5)); } -.menuicons { +.nav .menu{ color: #FF9A00; } .navbar .brand.login { @@ -202,8 +202,7 @@ div.lastactivity .activity .details { .infobox { background-color: FFFFFF; -border-color: #0D56A6; -border: 2px solid; +border: #0D56A6 2px; margin:15px; padding:35px; height: 220px; @@ -230,6 +229,7 @@ margin-left: 20px; background: -ms-linear-gradient(left, rgba(255,154,0,1) 0%,rgba(104,154,211,1) 57%,rgba(65,134,211,1) 83%,rgba(13,86,166,1) 99%); /* IE10+ */ background: linear-gradient(to right, rgba(255,154,0,1) 0%,rgba(104,154,211,1) 57%,rgba(65,134,211,1) 83%,rgba(13,86,166,1) 99%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9a00', endColorstr='#0d56a6',GradientType=1 ); /* IE6-9 */ + -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; diff --git a/views/navbar.ejs b/views/navbar.ejs index 7c81339..e9fe75f 100644 --- a/views/navbar.ejs +++ b/views/navbar.ejs @@ -47,10 +47,10 @@ <img class="logo" src="/img/dividlogo.png" href="#"> <!--<a class="brand" href="#">Divid</a>--!> <div class="nav-collapse collapse"> - <ul class="nav"> - <li><a class="menuicons" href="#signup">Registrer</a></li> - <li><a class="menuicons" href="#dashboard">Dashboard</a></li> - <li><a class="menuicons" href="#kontakt">Kontakt</a></li> + <ul class="nav menu"> + <li><a href="#signup">Registrer</a></li> + <li><a href="#dashboard">Dashboard</a></li> + <li><a href="#kontakt">Kontakt</a></li> </ul> </div> <% if(!loggedin) { %><a class="brand login" data-toggle="collapse" data-target=".login-collapse" href="#login">Logg inn</a> |