Merge branch 'tb-css' into develop

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/hunt_group_members/_index_core.html.haml b/app/views/hunt_group_members/_index_core.html.haml
index 46b64c8..c6b7e4a 100644
--- a/app/views/hunt_group_members/_index_core.html.haml
+++ b/app/views/hunt_group_members/_index_core.html.haml
@@ -1,13 +1,13 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('hunt_group_members.index.name')
     %th= t('hunt_group_members.index.active')
     %th= t('hunt_group_members.index.can_switch_status_itself')
     %th= t('hunt_group_members.index.phone_numbers')
 
-  - reset_cycle
+  
   - for hunt_group_member in hunt_group_members
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= hunt_group_member.name
       %td= hunt_group_member.active
       %td= hunt_group_member.can_switch_status_itself
diff --git a/app/views/hunt_group_members/edit.html.haml b/app/views/hunt_group_members/edit.html.haml
index 93d7b0a..97e9084 100644
--- a/app/views/hunt_group_members/edit.html.haml
+++ b/app/views/hunt_group_members/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("hunt_group_members.edit.page_title")
+- content_for :title, t("hunt_group_members.edit.page_title")
 
 = render "form"
diff --git a/app/views/hunt_group_members/index.html.haml b/app/views/hunt_group_members/index.html.haml
index 99dc929..4001000 100644
--- a/app/views/hunt_group_members/index.html.haml
+++ b/app/views/hunt_group_members/index.html.haml
@@ -1,4 +1,4 @@
-- title t("hunt_group_members.index.page_title")
+- content_for :title, t("hunt_group_members.index.page_title")
 
 - if @hunt_group_members.count > 0
   = render "index_core", :hunt_group_members => @hunt_group_members
diff --git a/app/views/hunt_group_members/new.html.haml b/app/views/hunt_group_members/new.html.haml
index 99f52ad..31dd185 100644
--- a/app/views/hunt_group_members/new.html.haml
+++ b/app/views/hunt_group_members/new.html.haml
@@ -1,3 +1,3 @@
-- title t("hunt_group_members.new.page_title")
+- content_for :title, t("hunt_group_members.new.page_title")
 
 = render "form"
diff --git a/app/views/hunt_group_members/show.html.haml b/app/views/hunt_group_members/show.html.haml
index 80123b8..2056db0 100644
--- a/app/views/hunt_group_members/show.html.haml
+++ b/app/views/hunt_group_members/show.html.haml
@@ -1,4 +1,4 @@
-- title t("hunt_group_members.show.page_title")
+- content_for :title, t("hunt_group_members.show.page_title")
 
 %p
   %strong= t('hunt_group_members.show.name') + ":"