site/views/layout.erb in edge_framework-0.1.0 vs site/views/layout.erb in edge_framework-0.2.0
- old
+ new
@@ -7,12 +7,11 @@
<link rel="icon" type="image/png" href="/img/favicon.png">
<link rel="apple-touch-icon-precomposed" href="img/favicon-big.png" />
<!-- VENDOR -->
<script type="text/javascript" src="/js/vendor/custom.modernizr.js"></script>
- <script type="text/javascript" src="/js/vendor/handlebars.min.js"></script>
- <link rel="stylesheet" href="/css/normalize.min.css" />
+ <script type="text/javascript" src="/js/vendor/handlebars.js"></script>
<link rel="stylesheet" href="/css/edge.css">
<!-- APP Specific -->
<link rel="stylesheet" href="/css/app.css">
@@ -22,25 +21,58 @@
<script type="text/javascript" src="/js/sh/shBrushSass.js"></script>
<script type="text/javascript" src="/js/sh/shBrushCss.js"></script>
<script type="text/javascript" src="/js/sh/shBrushJScript.js"></script>
<!--WEB FONT-->
- <link href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,300' rel='stylesheet' type='text/css'>
+ <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700|Bitter:400,700|Source+Code+Pro' rel='stylesheet' type='text/css'>
</head>
<body>
<div id="main-wrapper">
- <div id="content-topbar">
+ <header class="top-bar"></header>
+ <%= yield %>
+ <div id="footer-push"></div>
+</div>
+<footer id="footer">
+ <div class="block-footer">
<div class="row">
+ <div class="large-3 small-6 columns">
+ <nav>
+ <h5 class="footer-nav-title">Documentation</h5>
+ <ul class="footer-nav">
+ <li><a href="/docs/css/">Stylesheet</a></li>
+ <li><a href="/docs/js/">JavaScript</a></li>
+ <li><a href="/docs/compass/">Compass</a></li>
+ <li><a href="/docs/template/">Template</a></li>
+ </ul>
+ </nav>
+ </div>
+ <div class="large-3 small-5 columns">
+ <nav>
+ <h5 class="footer-nav-title">Keep in Touch</h5>
+ <ul class="footer-nav">
+ <li><a href="#">Contact</a></li>
+ <li><a href="#">Blog</a></li>
+ <li><a href="#">Forum</a></li>
+ <li><a href="#">Frequently Asked</a></li>
+ </ul>
+ </nav>
+ </div>
+ <div class="large-4 columns">
+ <div class="about-us">
+ <h5 class="footer-nav-title">About Edge</h5>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dicta, dolorum voluptate fugit nesciunt inventore placeat nulla culpa quod non doloribus.</p>
+ </div>
+ </div>
+ </div>
+ <div class="row">
<div class="large-12 columns">
- <h1>EDGE</h1>
+ <div class="copyright">
+ © 2013 The Syne
+ </div>
</div>
</div>
</div>
- <%= yield %>
- <div id="footer-push"></div>
-</div>
-<footer id="footer"></footer>
+</footer>
<!-- Google's Hosted JQuery -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script type="text/javascript">
// Use local jquery, if Google's one fails to load
\ No newline at end of file