Merge branch 'about_me_mobile_no_show_fix'

2014-04-02 10:14:11 +08:00 · 2014-04-02 10:14:11 +08:00 · 6fe828d8ec
parent 90aa28753e 131ead0f88
commit 6fe828d8ec
2 changed files with 2 additions and 2 deletions
--- a/app/assets/stylesheets/blogs.css.scss
+++ b/app/assets/stylesheets/blogs.css.scss
@ -44,7 +44,7 @@
 }

@media only screen and (max-width: 40em) {
-  .self-introduce {
+  .self-introduce-index {
    display: none;
  }
 }
--- a/app/views/blogs/index.html.slim
+++ b/app/views/blogs/index.html.slim
@ -20,7 +20,7 @@
      - @recent.each do |re|
        li = link_to "#{re.title}",blog_path(re)

-  .large-3.columns.large-offset-1.self-introduce ng-controller='AboutController'
+  .large-3.columns.large-offset-1.self-introduce.self-introduce-index ng-controller='AboutController'
    h4 WELCOME
    p 我是李亚飞, WinDy 是我的网名.