Fix merge conflict in commit with message:

Add filterbar styles missing

Change-Id: I80d1d9adc036c11d8ebcc2e5226c65b4e987030e
This commit is contained in:
Daniel Izquierdo 2014-10-12 17:18:30 +02:00
parent e9a275506f
commit 7bc83f9e12
1 changed files with 13 additions and 1 deletions

View File

@ -181,4 +181,16 @@ ul.scroll-menu {
max-height: 400px;
overflow-x: hidden;
}
/** */
/* watch out! filterbar should be part of master! */
.filterbar {
background-color: #F5F5F5;
border-radius: 4px;
list-style: none outside none;
margin-bottom: 20px;
padding: 8px 15px;
}
.filterbar > li {
display: inline-block;
}