Merge #1952 and solve conflict

This commit is contained in:
Frederic Guillot 2016-03-06 15:40:10 -05:00
commit c8de706e62
2 changed files with 6 additions and 1 deletions

File diff suppressed because one or more lines are too long

View File

@ -37,6 +37,10 @@
box-flex: 0;
}
.sidebar h2 {
margin-top: 0;
}
.sidebar a {
text-decoration: none;
}
@ -45,6 +49,7 @@
list-style-type: none;
line-height: 35px;
border-bottom: 1px dotted #efefef;
padding-left: 13px;
}
.sidebar li:hover {