Merge branch 'development'

true-runes · Jun 23, 2018 · 015b8fa · 015b8fa
2 parents 2ba7062 + d419197
commit 015b8fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -2,7 +2,7 @@ doctype html
 html
   head
     meta content=("text/html; charset=UTF-8") http-equiv="Content-Type"
-    title 幻水総選挙2018
+    title 幻水総選挙 2018 集計所
     = favicon_link_tag
     = csrf_meta_tags
     = csp_meta_tag

diff --git a/app/views/pages/home.html.slim b/app/views/pages/home.html.slim
@@ -12,4 +12,4 @@
   .row
     .col.s12
       h6.center-align
-        = link_to '幻水総選挙 2017 の結果はこちら', 'https://election-2017.suikoden.info/', target: '_new'
+        = link_to '幻水総選挙 2017 のサイトはこちら', 'https://election-2017.suikoden.info/', target: '_new'
diff --git a/app/views/shared/_navbar.html.slim b/app/views/shared/_navbar.html.slim
@@ -5,7 +5,7 @@ nav.blue.lighten-4
         .nav-wrapper
           a.sidenav-trigger data-target="nav-mobile" href="#"
             i.material-icons.icon-black menu
-          = link_to '幻水総選挙 2018', root_path, class: 'black-text'
+          = link_to '幻水総選挙 2018 集計所', root_path, class: 'black-text'
           ul.right.hide-on-med-and-down
             li
               = link_to '投票方法', 'https://twitter.com/gensosenkyo/status/1010336071077335040', target: '_new', class: 'black-text'
@@ -18,7 +18,7 @@ nav.blue.lighten-4
 ul#nav-mobile.sidenav
   li
     .user-view.blue.lighten-4
-      = '幻水総選挙 2018'
+      = '幻水総選挙 2018 集計所'
   li
     = link_to '投票方法', 'https://twitter.com/gensosenkyo/status/1010336071077335040', target: '_new'
     / how_to_vote_pages_path