#35 Move Navigation bar to layout file.

Author: Yuma Soga

app/views/layouts/staticpages.html.haml

@@ -24,4 +24,20 @@
     %link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800", :rel => "stylesheet", :type => "text/css"}/
     %link{:href => "https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic", :rel => "stylesheet", :type => "text/css"}/
   %body#page-top
+    / Navigation
+    %nav#mainNav.navbar.navbar-expand-lg.navbar-light.fixed-top
+      .container-fluid
+        %a.navbar-brand.js-scroll-trigger{:href => "#page-top"}
+        %button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarResponsive", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarResponsive", "data-toggle" => "collapse", :type => "button"}
+          %span.navbar-toggler-icon
+        #navbarResponsive.collapse.navbar-collapse
+          %ul.navbar-nav.ml-auto
+            %li.nav-item
+              %a.nav-link.js-scroll-trigger{:href => "#about"} About
+            %li.nav-item
+              %a.nav-link.js-scroll-trigger{:href => "#services"} Services
+            %li.nav-item
+              %a.nav-link.js-scroll-trigger{:href => "#portfolio"} Portfolio
+            %li.nav-item
+              %a.nav-link.js-scroll-trigger{:href => "#contact"} Contact
     = yield

app/views/staticpages/index.html.haml

@@ -1,19 +1,3 @@
-/ Navigation
-%nav#mainNav.navbar.navbar-expand-lg.navbar-light.fixed-top
-  .container-fluid
-    %a.navbar-brand.js-scroll-trigger{:href => "#page-top"}
-    %button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarResponsive", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarResponsive", "data-toggle" => "collapse", :type => "button"}
-      %span.navbar-toggler-icon
-    #navbarResponsive.collapse.navbar-collapse
-      %ul.navbar-nav.ml-auto
-        %li.nav-item
-          %a.nav-link.js-scroll-trigger{:href => "#about"} About
-        %li.nav-item
-          %a.nav-link.js-scroll-trigger{:href => "#services"} Services
-        %li.nav-item
-          %a.nav-link.js-scroll-trigger{:href => "#portfolio"} Portfolio
-        %li.nav-item
-          %a.nav-link.js-scroll-trigger{:href => "#contact"} Contact
 %header.masthead.text-center.text-white.d-flex
   .container.my-auto
     .row
@@ -80,7 +64,7 @@
   .container
     .row
       .col-lg-8.mx-auto.p-3.my-3
-        %img.img-fluid{:alt => "開催風景 1", :src => "#{asset_path "index/introduction-image/dojo-image-6.jpg"}"}/
+        %img.img-fluid{:alt => "開催風景 1", :src => "#{asset_path "index/introduction-image/dojo-image-06.jpg"}"}/
       .col-lg-8.mx-auto.my-3.text-center
         %h2.section-heading Thinking together - 一緒になって考える
         %hr.light.my-4/