moving nav & header to default's template

zenorocha · zenorocha · commit c361b5805cc6 · 2012-09-24T11:31:11.000-03:00
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -2,15 +2,42 @@
 <html>
 <head>
 
+  <title>Conf Boilerplate :: BrazilJS</title>
+
   <meta charset="utf-8">
-  <title>Conf Boilerplate</title>
-  <link rel="stylesheet" href="/assets/css/main.css">
+  <meta name="author" content="">
+  <meta name="description" content="">
+  <meta name="viewport" content="width=device-width">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+
+  <link rel="stylesheet" type="text/css" href="assets/css/reset.css">
+  <link rel="stylesheet" type="text/css" href="assets/css/base.css">
+  <link rel="stylesheet" type="text/css" href="assets/css/theme.css">
 
 </head>
 <body>
 
-  <div id="wrapper">
-    {{ content }}
+  <div class="global">
+
+    {% include nav.html %}
+    {% include header.html %}
+
+    <!-- CONTENT -->
+    <section class="content" id="content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </section>
+    <!--  / CONTENT -->
+
+    <hr />
+
+    <!-- FOOTER -->
+    <footer class="footer"></footer>
+    <!-- / FOOTER -->
+
   </div>
 
 </body>
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/index.html b/index.html
@@ -2,9 +2,6 @@
 layout: default
 ---
 
-{% include nav.html %}
-{% include intro.html %}
-
 {% include section/about.html %}
 {% include section/location.html %}
 {% include section/speakers.html %}
