From f9c8197187b8e694c4c2242c38d226b15bedd924 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 16 May 2018 10:03:41 +0300
Subject: [PATCH] Simple theme updates

---
 site/themes/simple/assets/scss/base/main.scss  | 8 ++++----
 site/themes/simple/package.json                | 2 +-
 site/themes/simple/views/partials/footer.php   | 2 +-
 site/themes/simple/views/partials/head.php     | 9 +++------
 site/themes/simple/views/templates/default.php | 4 ++--
 5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/site/themes/simple/assets/scss/base/main.scss b/site/themes/simple/assets/scss/base/main.scss
index f2aefb31..7b84d917 100755
--- a/site/themes/simple/assets/scss/base/main.scss
+++ b/site/themes/simple/assets/scss/base/main.scss
@@ -5,8 +5,8 @@
 
 html,
 body {
-    font-family: 'Source Sans Pro', sans-serif;
-    font-size: 16px;
+    font-family: $base-font-family;
+    font-size: $base-font-size;
 
     height: 100%;
 
@@ -20,7 +20,7 @@ input,
 select,
 textarea,
 p {
-    font-family: 'Source Sans Pro', sans-serif;
+    font-family: $base-font-family;
     font-weight: 400;
 
     color: black;
@@ -28,7 +28,7 @@ p {
 
 body,
 p {
-    line-height: 26px;
+    line-height: $base-line-height;
 }
 
 pre {
diff --git a/site/themes/simple/package.json b/site/themes/simple/package.json
index 4e72b548..43ecb41a 100755
--- a/site/themes/simple/package.json
+++ b/site/themes/simple/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "flextype.org",
+  "name": "flextype",
   "version": "1.0.0",
   "devDependencies": {
     "es6-promise": "^4.2.4",
diff --git a/site/themes/simple/views/partials/footer.php b/site/themes/simple/views/partials/footer.php
index 4aeb539e..2f9275fe 100755
--- a/site/themes/simple/views/partials/footer.php
+++ b/site/themes/simple/views/partials/footer.php
@@ -1,6 +1,6 @@
 <?php namespace Flextype; ?>
 
-    <?php Themes::template('partials/tail')->display(); ?>
+    <?php Themes::view('partials/tail')->display(); ?>
 
     <div class="powered">
       Powered by <a href="http://flextype.org">Flextype</a>
diff --git a/site/themes/simple/views/partials/head.php b/site/themes/simple/views/partials/head.php
index 4602b1dc..efd56220 100755
--- a/site/themes/simple/views/partials/head.php
+++ b/site/themes/simple/views/partials/head.php
@@ -16,13 +16,10 @@
 
     <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700' rel='stylesheet' type='text/css'>
 
-    <!-- Bootstrap core CSS -->
-	<link href="<?php echo Http::getBaseUrl(); ?>/site/themes/<?php echo Registry::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<?php echo Http::getBaseUrl(); ?>/site/themes/<?php echo Registry::get('site.theme'); ?>/assets/dist/css/simple.css" rel="stylesheet">
 
-    <!-- Custom styles for this template -->
-	<link href="<?php echo Http::getBaseUrl(); ?>/site/themes/<?php echo Registry::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
-	<?php Event::dispatch('onThemeHeader'); ?>
+    <?php Event::dispatch('onThemeHeader'); ?>
   </head>
   <body>
-  <?php Themes::template('partials/navigation')->display(); ?>
+  <?php Themes::view('partials/navigation')->display(); ?>
   <main role="main" class="container content">
diff --git a/site/themes/simple/views/templates/default.php b/site/themes/simple/views/templates/default.php
index bad96304..e5e9fe8a 100755
--- a/site/themes/simple/views/templates/default.php
+++ b/site/themes/simple/views/templates/default.php
@@ -1,4 +1,4 @@
 <?php namespace Flextype; ?>
-<?php Themes::template('partials/head')->display(); ?>
+<?php Themes::view('partials/head')->display(); ?>
 <?php echo $page['content']; ?>
-<?php Themes::template('partials/footer')->display(); ?>
+<?php Themes::view('partials/footer')->display(); ?>
