Merge pull request coderdojorise#4 from cajogos/master

cajogos · web-flow · commit b74f6e9d6c14 · 2020-10-04T11:46:35.000+01:00
Initial removal of master from the template code
diff --git a/404.html b/404.html
@@ -1,6 +1,6 @@
 ---
 permalink: /404
-layout: master
+layout: main
 ---
 
 <div class="container" style="text-align: center;margin:40px auto">
diff --git a/_layouts/main.html b/_layouts/main.html
@@ -9,7 +9,7 @@
 
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" />
-        <link rel="stylesheet" href="{{ 'assets/css/master.css' | relative_url }}" />
+        <link rel="stylesheet" href="{{ 'assets/css/styles.css' | relative_url }}" />
     </head>
     <body>
         {% include header.html %}
diff --git a/assets/css/styles.scss b/assets/css/styles.scss
diff --git a/blog.md b/blog.md
@@ -1,3 +1,3 @@
 ---
-layout: master
+layout: main
 ---
diff --git a/favicon.ico b/favicon.ico
diff --git a/pages/about-us.html b/pages/about-us.html
@@ -1,6 +1,6 @@
 ---
 permalink: /about-us
-layout: master
+layout: main
 title: Find out about CoderDojo in London
 breadcrumbs: "Home:/:;About Us:/about-us:about-us active"
 ---
diff --git a/pages/attend-a-dojo.html b/pages/attend-a-dojo.html
@@ -1,6 +1,6 @@
 ---
 permalink: /attend-a-dojo
-layout: master
+layout: main
 title: Attend a CoderDojo in London
 breadcrumbs: "Home:/:;Attend a Dojo:/attend-a-dojo:attend active"
 ---
diff --git a/pages/index.html b/pages/index.html
@@ -1,6 +1,6 @@
 ---
 permalink: /
-layout: master
+layout: main
 title: CoderDojo - Be Cool and get involved
 breadcrumbs: "Home:/:"
 ---

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 ---
 -layout: master
 +layout: main
 ---