Merge branch 'live-in-same-timeline-with-everyone' of github.com:mame…

…bro/mameblo into live-in-same-timeline-with-everyone
mamebro · May 22, 2014 · 85e3a8e · 85e3a8e
2 parents 96e74f3 + 1ce7148
commit 85e3a8e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/app/assets/stylesheets/timelines.scss b/app/assets/stylesheets/timelines.scss
@@ -1,8 +1,10 @@
 @import 'import';
 
 .nav-pills {
+  @include box-sizing(border-box);
   width: 100%;
-  margin-bottom: $gap*2;
+  height: 44px;
+  margin-bottom: $gap;
   display: table;
   background: #eee;
   border: 1px solid $orange;
@@ -15,11 +17,11 @@
       vertical-align: center;
       display: table-cell;
       a {
-        height: 3em;
+        height: 44px;
         display: block;
         color: $orange;
-        font-size: $px14;
-        line-height: 3em;
+        font-size: $px13;
+        line-height: 44px;
       }
     }
   }

diff --git a/app/views/layouts/_nav.html.haml b/app/views/layouts/_nav.html.haml
@@ -8,7 +8,7 @@
           %i.iconbutton<>
             &#128246;
           %span<>
-            兄弟
+            近況
       %li.nav.nav-entries
         = link_to current_brother, class: 'nav-label' do
           %i.iconbutton<>

diff --git a/app/views/timelines/_navs.html.haml b/app/views/timelines/_navs.html.haml
@@ -2,7 +2,7 @@
   %ul{class: "nav-pill-wrapper current-#{current_page}"}
     %li.nav-pill.nav-pill-index
       %a{href: '/'}
-        みんな
+        ブラザー
     %li.nav-pill.nav-pill-brothers
-      %a{href:'/timelines/brothers'}
+      %a{href: '/timelines/brothers'}
         兄弟
diff --git a/spec/features/brothers_spec.rb b/spec/features/brothers_spec.rb
@@ -15,7 +15,7 @@
     end
 
     scenario 'ブラザーの一覧が表示されること' do
-      is_expected.to have_content('兄弟')
+      is_expected.to have_content('近況')
       is_expected.to have_content brother.name
       is_expected.to have_content @brother.name
     end

diff --git a/spec/features/timelines_spec.rb b/spec/features/timelines_spec.rb
@@ -15,7 +15,7 @@
         sign_in brother
       end
 
-      scenario { is_expected.to have_content('兄弟') }
+      scenario { is_expected.to have_content('近況') }
       scenario { is_expected.to have_content('みんな') }
       scenario { is_expected.to have_content('設定') }
       scenario { is_expected.to have_selector('.field #entry-form-title', 'タイトル') }