Merge branch 'apps' into pending

This commit is contained in:
Galen Wolfe-Pauly 2015-09-02 16:23:39 -07:00
commit 13e94e7295
2 changed files with 2 additions and 2 deletions

View File

@ -315,7 +315,7 @@ h1.leader:after {
margin: 0.5rem 0 0.5rem 2rem;
}
.item .discussion {
max-height: 18rem;
max-height: 9rem;
overflow-x: hidden;
overflow-y: scroll;
}

View File

@ -239,7 +239,7 @@ h1.leader:after
margin .5rem 0 .5rem 2rem
.discussion
max-height 18rem
max-height 9rem
overflow-x hidden
overflow-y scroll