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

2011-09-04 23:15:02 -07:00 · 2011-09-04 23:15:02 -07:00 · 58161b006a
commit 58161b006a
parent 5e388bf4c2 b6e2647530
1 changed files with 3 additions and 3 deletions
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@ -44,7 +44,7 @@ ul > li
 form
  :position relative
  input,
-  textarea
+  textarea,
  label
    :font
      :size auto
@ -498,8 +498,8 @@ ul.as-selections
  .stream_element
    .content
      p
-      :font
-        :size 1em
+        :font
+          :size 1em

  .comment_box
    :width 653px