From 71840b89e4f4d2801cd2f7db02e320e6894f0e9f Mon Sep 17 00:00:00 2001 From: yafeilee Date: Mon, 26 May 2014 22:08:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=B0=8F=E5=B1=8F=E4=B8=8B=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E6=88=91=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/blogs.css.scss | 5 ---- app/views/blogs/index.html.slim | 38 ++++++++++++++------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/blogs.css.scss b/app/assets/stylesheets/blogs.css.scss index 92f4bf8..a42739b 100644 --- a/app/assets/stylesheets/blogs.css.scss +++ b/app/assets/stylesheets/blogs.css.scss @@ -55,11 +55,6 @@ padding-left: 0rem; } -@media only screen and (max-width: 40em) { - .self-introduce-index { - display: none; - } -} .self-introduce { margin-top: 2.2rem; diff --git a/app/views/blogs/index.html.slim b/app/views/blogs/index.html.slim index c55ee8a..219fe39 100644 --- a/app/views/blogs/index.html.slim +++ b/app/views/blogs/index.html.slim @@ -28,21 +28,23 @@ /*请到 common 调整个人设置*/ = render 'common/welcome' h4 SUBSCRIBE - ul.subscribe-ul - - if ENV['MAIL_SERVER'].present? - li - = link_to '邮件订阅 ', '', "ng-click"=>"click('email')" - .email-subscribe ng-show="type == 'email'" - = text_field_tag 'email', nil, placeholder: 'your@email.com', 'ng-model'=>'email' - button.small ng-click="subscribe()" ng-disabled="! email_validate()" 订阅 - span.subscribe-success ng-show="subscribe_success" 订阅成功 - span.subscribe-fail ng-show="subscribe_success == false" {{subscribe_fail_msg}} - li - = link_to '微信扫一扫', '', "ng-click"=>"click('weixin')" - .weixin-subscribe ng-show="type == 'weixin'" - = render partial: "qrcode", locals: { str: root_url } - li - = link_to 'RSS订阅', '', "ng-click"=>"click('rss')" - .rss-subscribe ng-show="type == 'rss'" - = link_to rss_blogs_path do - - image_tag('rss.png') + .row.ng-cloak + .small-12.medium-6.columns + ul.subscribe-ul + - if ENV['MAIL_SERVER'].present? + li + = link_to '邮件订阅 ', '', "ng-click"=>"click('email')" + .email-subscribe ng-show="type == 'email'" + = text_field_tag 'email', nil, placeholder: 'your@email.com', 'ng-model'=>'email' + button.small ng-click="subscribe()" ng-disabled="! email_validate()" 订阅 + span.subscribe-success ng-show="subscribe_success" 订阅成功 + span.subscribe-fail ng-show="subscribe_success == false" {{subscribe_fail_msg}} + li + = link_to '微信扫一扫', '', "ng-click"=>"click('weixin')" + .weixin-subscribe ng-show="type == 'weixin'" + = render partial: "qrcode", locals: { str: root_url } + li + = link_to 'RSS订阅', '', "ng-click"=>"click('rss')" + .rss-subscribe ng-show="type == 'rss'" + = link_to rss_blogs_path do + - image_tag('rss.png')