diff --git a/app/assets/stylesheets/matomes.css.scss b/app/assets/stylesheets/matomes.css.scss index 808076a..d185537 100644 --- a/app/assets/stylesheets/matomes.css.scss +++ b/app/assets/stylesheets/matomes.css.scss @@ -11,8 +11,8 @@ @import "common"; $header_width: 960px; -$infomation_width: 600px; -$contribute_width: 300px; +$infomation_width: 760px; +$contribute_width: 200px; $cover_size: 100px; // header @@ -69,6 +69,8 @@ $cover_size: 100px; } .meta { + vertical-align: middle; + .description { margin-right: 0.5em; } @@ -79,7 +81,8 @@ $cover_size: 100px; } .user { - margin-top: 0.5em; + display: inline-block; + margin-top: 10px; img { vertical-align: middle; @@ -93,9 +96,6 @@ $cover_size: 100px; .name { font-weight: bold; } - - .title { - } } #edit { @@ -231,6 +231,28 @@ $cover_size: 100px; } } +// social button +#matome .social { + display: inline-block; + margin-top: 3px; + margin-left: 10px; + height: 26px; + max-width: 330px; + vertical-align: middle; + white-space: nowrap; + overflow: hidden; + + li { + display: inline-block; + margin-right: 5px; + margin-bottom: 5px; + + &.twitter { + width: 90px; + } + } +} + // dialog #matome_dialog { img { diff --git a/app/views/matomes/show.html.slim b/app/views/matomes/show.html.slim index f6db654..d0029b0 100644 --- a/app/views/matomes/show.html.slim +++ b/app/views/matomes/show.html.slim @@ -12,16 +12,26 @@ = link_to 'まとめを編集', edit_matome_path(@matome) .text h1 = @matome.title - p.meta + .meta - if @matome.description.present? span.description = @matome.description span.updated_at | 更新日: = I18n.l @matome.updated_at.to_date, format: :long - p.user - span.avatar = link_to_user_by_avatar(@matome.user) - span.name = "#{@matome.user.nick_name}" - span.title さん + .meta + .user + span.avatar = link_to_user_by_avatar(@matome.user) + span.name = link_to @matome.user.nick_name, user_path(@matome.user) + span.title さん + .social + ul + li.twitter + == render partial: '/base/twitter_button', locals: { target: @matome } + li.facebook + == render partial: '/base/facebook_button', locals: { target: @matome } + li.mixi + == render partial: '/base/mixi_button', locals: { target: @matome } + .contribute p.meta .like