Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Sarah Mei 2011-09-04 23:15:02 -07:00
commit 58161b006a

View file

@ -44,7 +44,7 @@ ul > li
form form
:position relative :position relative
input, input,
textarea textarea,
label label
:font :font
:size auto :size auto
@ -498,8 +498,8 @@ ul.as-selections
.stream_element .stream_element
.content .content
p p
:font :font
:size 1em :size 1em
.comment_box .comment_box
:width 653px :width 653px