Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix

This commit is contained in:
Hexagon 2010-11-26 16:18:41 +01:00
commit a520b371e1

View file

@ -261,7 +261,12 @@ header
:-webkit-border-radius 5px :-webkit-border-radius 5px
:-moz-border-radius 5px :-moz-border-radius 5px
:border-radius 5px :border-radius 5px
.youtube-player
:border none
:height: 325px
:width: 500px
.from .from
:font :font
:family 'Helvetica neue', Arial, Helvetica, sans-serif :family 'Helvetica neue', Arial, Helvetica, sans-serif
@ -570,6 +575,11 @@ ul.comments
:border :border
:bottom 1px solid #ddd :bottom 1px solid #ddd
.youtube-player
:border none
:height: 250px
:width: 400px
.content .content
:color #777 :color #777
:margin :margin
@ -1978,4 +1988,3 @@ h3,h4
#edit_aspect_trigger #edit_aspect_trigger
:font :font
:size 12px :size 12px