From c82e33964041a586d1d6fdb336664c588141a370 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 24 Apr 2012 19:40:33 -0700 Subject: [PATCH] follow button in [ci skip] --- app/assets/images/buttons/follow_hover.png | Bin 0 -> 3796 bytes app/assets/stylesheets/new_styles/_canvas.scss | 9 ++++----- app/assets/templates/profile.jst.hbs | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 app/assets/images/buttons/follow_hover.png diff --git a/app/assets/images/buttons/follow_hover.png b/app/assets/images/buttons/follow_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..5e1d3ed92fffec0c78e2b7b5fd3142c01e4ff03b GIT binary patch literal 3796 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index 59ab93d1f..41a63c6a8 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -152,6 +152,10 @@ body { max-width: 100%; width: 100%; } + + p:last-child { + margin-bottom: 0; + } } &.sticky-note { @@ -224,15 +228,10 @@ body { &.night:not(.sticky-note), &.multi-photo:not(.sticky-note) { .text-content { - @include opacity(1); padding : 10px 20px; font-size : 14px; line-height : 18px; color : #444; - - p:last-child { - margin-bottom: 0; - } } } diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index 881b09853..49cfc1340 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -12,6 +12,10 @@ + {{else}} + + + {{/if}}