fixed default main layout to match new branding

daylightstudio · Dec 13, 2013 · 0826387 · 0826387
1 parent 15d415c
commit 0826387
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 208 deletions.
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/images/_template_icons.svg b/assets/images/_template_icons.svg
diff --git a/fuel/application/views/_blocks/footer.php b/fuel/application/views/_blocks/footer.php
@@ -1,13 +1,18 @@
-		</div>
-	</div>
-	<div id="footer">
-		<div id="footer_top">
-
-		</div>
-		<div id="footer_bot">
-			<div id="copyright">FUEL CMS is a product by <a href="http://www.thedaylightstudio.com" target="_blank">Daylight Studio</a>. <br />Copyright &copy; <?php echo date('Y')?> Daylight Studio,  All Rights Reserved.</div>
-		</div>
+			</div>
 	</div>
+	<div class="wrapper">
+	<footer class="row footer">
+		<nav class="mainnav">
+			<ul>
+				<li class="first active"><a href="http://www.getfuelcms.com" target="_blank">Home</a></li>
+				<li><a href="http://getfuelcms.com/features" target="_blank">Features</a></li>
+				<li><a href="http://getfuelcms.com/developers" target="_blank">Developers</a></li>
+				<li><a href="http://getfuelcms.com/support" target="_blank">Support</a></li>
+				<li class="last"><a href="http://getfuelcms.com/blog" target="_blank">Blog</a></li>
+			</ul>
+		</nav>
+		<p class="colophon">FUEL CMS is developed with love by <a href="http://thedaylightstudio.com" target="_blank">Daylight Studio</a> <object type="image/svg+xml" width="25" height="25" data="<?= img_path('_template_icons.svg#daylight') ?>"></object> &copy; <?php echo date("Y"); ?> Run for Daylight LLC, All Rights Reserved.</p>
+	</footer>
 </div>
 
 <?php echo js('main').js($js); ?>

diff --git a/fuel/application/views/_blocks/header.php b/fuel/application/views/_blocks/header.php
@@ -1,61 +1,34 @@
 <!DOCTYPE html>
-
 <html lang="en-US">
 <head>
 	<meta charset="utf-8">
-
-	<title>
+ 	<title>
 		<?php 
-			if (!empty($is_blog))
-			{
+			if (!empty($is_blog)) :
 				echo $CI->fuel_blog->page_title($page_title, ' : ', 'right');
-			}
-			else
-			{
+			else:
 				echo fuel_var('page_title', '');
-			}
+			endif;
 		?>
 	</title>
 
 	<meta name="keywords" content="<?php echo fuel_var('meta_keywords')?>">
 	<meta name="description" content="<?php echo fuel_var('meta_description')?>">
 
+	<link href='http://fonts.googleapis.com/css?family=Raleway:400,700' rel='stylesheet' type='text/css'>
 	<?php
 		echo css('main').css($css);
 
-		if (!empty($is_blog))
-		{
+		if (!empty($is_blog)):
 			echo $CI->fuel_blog->header();
-		}
+		endif;
 	?>
 
-	<?php echo jquery('1.8.3');	?>
 </head>
-
-<body class="<?php echo fuel_var('body_class', ''); ?>">
-<div id="container">
-	<div id="container_inner">
-		<div id="header">
-			<div id="topnav">
-				<ul>
-					<li><a href="http://www.thedaylightstudio.com">About Daylight</a></li>
-					<li class="last"><?php echo mailto('[email protected]', 'Contact'); ?></li>
-				</ul>
-			</div>
-			<a href="http://www.thedaylightstudio.com" id="daylight_logo"></a>
-
-			<a href="<?php echo site_url(); ?>" id="fuel_logo">FUEL CMS</a>
-
-			<div id="fuel_intro">
-				<h1 id="fuel_cms">FUEL CMS</h1>
-				<div id="fuel_tagline"></div>
-				<div id="fuel_text">
-					<p class="intro"><strong>An easy, flexible, empowering Content Management System for rapid development</strong>
-						that transforms your CodeIgniter projects into client manageable brilliance. 
-					</p>
-				</div>
-			</div>
-
-		</div>
-
-		<div id="main">
+<body>
+	<div class="page">
+		<div class="wrapper">
+			<header class="page_header">
+				<div class="logo"><object type="image/svg+xml" width="160" height="145" data="<?= img_path('_template_icons.svg#fuel') ?>"></object></div>
+				<h1><?=fuel_var('heading')?></h1>
+			</header>