From 9487cc42c5b49f2d87eb217a6061ed77248f6216 Mon Sep 17 00:00:00 2001
From: Ian Adam Naval <ianonavy@gmail.com>
Date: Wed, 8 Jan 2014 21:42:03 -0800
Subject: [PATCH] Simplified code further.

---
 src/static/css/about.css     | 33 ----------------
 src/static/css/error.css     |  2 +-
 src/static/css/portfolio.css | 52 ++++++++-----------------
 src/static/css/style.css     | 73 +++---------------------------------
 src/templates/base.html      | 52 ++++++++++++-------------
 src/templates/index.html     | 22 +++++------
 src/templates/labs.html      |  3 +-
 7 files changed, 57 insertions(+), 180 deletions(-)
 delete mode 100644 src/static/css/about.css

diff --git a/src/static/css/about.css b/src/static/css/about.css
deleted file mode 100644
index ec5b479..0000000
--- a/src/static/css/about.css
+++ /dev/null
@@ -1,33 +0,0 @@
-#main {
-    font-family: "Ubuntu", sans-serif;
-}
-
-img#me {
-    position: relative;
-    width: 240px;
-    float: left;
-}
-
-/*img#me.fixed {
-    position: fixed;
-    top: 48px;
-}*/
-
-#skills, #about-me, #hobbies {
-    margin: 0;
-    padding: 0;
-    width: 600px;
-    float: right;
-}
-
-#skills ul {
-    margin: 0;
-    padding: 0 0 2em 2em;
-    font-size: 1em;
-}
-
-#skills p, #about-me p, #hobbies p {
-    margin: 0 0 1em;
-    text-indent: 2.5em;
-    font-size: 1em;
-}
diff --git a/src/static/css/error.css b/src/static/css/error.css
index e1380ba..ef985a5 100644
--- a/src/static/css/error.css
+++ b/src/static/css/error.css
@@ -2,7 +2,7 @@
     text-align: center;
 }
 
-img#error-cat {
+#error-cat {
     margin: 1em;
     width: 240px;
 }
\ No newline at end of file
diff --git a/src/static/css/portfolio.css b/src/static/css/portfolio.css
index c981581..a1144f8 100644
--- a/src/static/css/portfolio.css
+++ b/src/static/css/portfolio.css
@@ -1,50 +1,30 @@
-.item {
-    display: block;
-    margin: 1em 0 3em;
-    clear: both;
-}
-
-.item img {
-    margin: 0 16px 16px 0;
-    box-shadow: 0 0 16px 4px #000;
-    float: left;
-}
-
-.item a {
-    border: none;
-}
-
-.item h3 {
-    display: inline;
-}
-
-.item p {
-    padding: 8px;
-}
-
 .section {
     margin: 0;
     padding: 2em 0 0;
     clear: both;
 }
 
-#android .item img {
+#me {
+    position: relative;
     width: 240px;
+    float: left;
 }
 
-#websites .item img {
-    width: 320px;
+.about-section {
+    margin: 0;
+    padding: 0;
+    width: 600px;
+    float: right;
 }
 
-#sysadmin .item img {
-    width: 320px;
+.about-section ul {
+    margin: 0;
+    padding: 0 0 2em 2em;
+    font-size: 1em;
 }
 
-@media (max-width: 650px) {
-    #android img, #websites img, #sysadmin img {
-        display: block;
-        float: none;
-        clear: both;
-        margin: 1em auto;
-    }
+.about-section p {
+    margin: 0 0 1em;
+    text-indent: 2.5em;
+    font-size: 1em;
 }
diff --git a/src/static/css/style.css b/src/static/css/style.css
index 15d50a6..a47228b 100644
--- a/src/static/css/style.css
+++ b/src/static/css/style.css
@@ -35,7 +35,7 @@ a:visited {
     font-family: "Ubuntu Mono", monospace;
 }
 
-#header img#logo {
+#logo {
     margin: 0;
     padding: 0;
     float: left;
@@ -49,18 +49,18 @@ a:visited {
     font-size: 2.5em;
 }
 
-#header h2#tagline {
+#tagline {
     margin: 0;
     font-size: .75em;
     font-weight: normal;
 }
 
-#header #name {
+#name {
     display: inline-block;
     font-family: "Ubuntu", sans-serif;
 }
 
-#header #name a {
+#name a {
     color: #fff;
 }
 
@@ -74,23 +74,6 @@ a:visited {
     background: #000;
 }
 
-#nav.top {
-    position: relative;
-    top: auto;
-    left: auto;
-    padding: 0;
-    font-size: .85em;
-}
-
-#nav.scrolled {
-    position: fixed;
-    top: 0;
-    left: 0;
-    padding: 4px;
-    font-size: .7em;
-    z-index: 1;
-}
-
 #nav ul {
     clear: both;
     display: inline-block;
@@ -101,16 +84,9 @@ a:visited {
 #nav li {
     display: inline-block;
     list-style: none;
-}
-
-#nav.top li {
     padding: 0 1em 0;
 }
 
-#nav.scrolled li {
-    padding: 0 .65em 0;
-}
-
 #nav li.selected a {
     color: #099;
 }
@@ -119,30 +95,6 @@ a:visited {
     text-decoration: none;
 }
 
-#nav.top #top-link {
-    display: none;
-}
-
-#nav.scrolled #top-link {
-    display: inline;
-}
-
-#small-logo {
-    margin: 0;
-    padding: 0;
-    vertical-align: middle;
-    display: none;
-    width: 24px;
-}
-
-#nav.top #small-logo {
-    display: none;
-}
-
-#nav.scrolled #small-logo {
-    display: inline-block;
-}
-
 /* Main body */
 #main {
     margin: 0;
@@ -228,15 +180,6 @@ body {
     #header {
 	font-size: 1.75em;
     }
-
-    #nav.scrolled {
-        max-width: 980px;
-        font-size: .9em;
-    }
-
-    #nav.scrolled #small-logo {
-        display: none;
-    }
 }
 
 @media (max-width: 900px) {
@@ -250,7 +193,7 @@ body {
 	font-size: 1.5em;
     }
 
-    #header img#logo {
+    #logo {
         display: block;
         width: 128px;
         margin: 0 auto;
@@ -268,13 +211,9 @@ body {
         min-width: 480px;
     }
 
-    #header img#logo {
+    #logo {
         display: block;
         width: 64px;
         margin: 0 auto;
     }
-
-    #greeting {
-        display: none;
-    }
 }
diff --git a/src/templates/base.html b/src/templates/base.html
index 8c1d9fc..30ab7fb 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -2,49 +2,32 @@
 <html>
   <head>
     <title>ianonavy{% block title %}{% endblock title %}</title>
+    
     <meta charset="utf-8" />
     <meta name="keywords" content="ianonavy, freelance, android, web, developer, ian, adam, naval">
     <meta name="description" content="Portfolio for software engineer and sysadmin Ian Adam Naval.">
     <meta name="author" content="Ian Adam Naval">
     <meta name="robots" content="index,follow">
-    <link href="http://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" media="all">
-      <link href="http://fonts.googleapis.com/css?family=Ubuntu+Mono" rel="stylesheet" type="text/css" media="all">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
-    {% block extrastyle %}{% endblock %}
-    <!--[if lt IE 9]>
-      <script type="text/javascript" src="{{ url_for('static', filename='lib/modernizr.js') }}"></script>
-      <script type="text/javascript" src="{{ url_for('static', filename='lib/html5shiv.js') }}"></script>
-    <![endif]-->
-    <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-33981209-1']);
-    _gaq.push(['_trackPageview']);
 
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-    </script>
+    <link href="http://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css" media="all">
+    <link href="http://fonts.googleapis.com/css?family=Ubuntu+Mono" rel="stylesheet" type="text/css" media="all">
+    <link href="{{ url_for('static', filename='css/style.css') }}"rel="stylesheet" type="text/css" media="screen" />
+    {% block extrastyle %}{% endblock extrastyle %}
   </head>
 
   <body>
-    <!--[if lt IE 8]><p>Sorry, your browser is not supported! You can try to use this website with your current browser, but we make no guarantees that it will work or look good. Please try using a different browser such as <a href="http://www.google.com/chrome">Google Chrome</a> or <a href="http://www.getfirefox.com/">Mozilla Firefox</a>. If you really want to stick with Internet Explorer, please <a href="http://windows.microsoft.com/en-US/internet-explorer/products/ie/home"> upgrade your browser</a> to at least IE 9.</p><![endif]-->
     <header id="header">
       <a href="/"><img id="logo" src="{{ url_for('static', filename='img/logo-196.png') }}" alt="ianonavy logo" /></a>
       <h1 id="name"><a href="/">Ian Adam Naval</a></h1>
       <h2 id="tagline">Software engineer/sysadmin from Los Angeles, CA</h2>
 
-      <nav id="nav" class="top">
-        <a href="/"><img id="small-logo" src="{{ url_for('static', filename='img/logo-24.png') }}" alt="small ianonavy logo" /></a>
+      <nav id="nav">
         <ul>
-          <li{% block nav_portfolio %}{% endblock nav_portfolio %}><a href="{{ url_for('home') }}#portfolio">Portfolio</a></li>
-          <li{% block nav_about %}{% endblock nav_about %}><a href="{{ url_for('home') }}#about">About</a></li>
-          <li{% block nav_contact %}{% endblock nav_contact %}><a href="{{ url_for('home') }}#contact">Contact</a></li>
-          <li{% block nav_labs %}{% endblock nav_labs %}><a href="{{ url_for('labs') }}">Labs</a></li>
-          <li{% block nav_code %}{% endblock nav_code %}><a href="http://www.github.com/ianonavy">Code</a></li>
-          <li{% block nav_blog %}{% endblock nav_blog %}><a href="http://blog.ianonavy.com/">Blog</a></li>
-          <li id="top-link"><a href="javascript:scrollToTop();">^Top^</a></li>
+          <li><a href="{{ url_for('home') }}#portfolio">Portfolio</a></li>
+          <li><a href="{{ url_for('home') }}#about">About</a></li>
+          <li><a href="{{ url_for('home') }}#contact">Contact</a></li>
+          <li><a href="{{ url_for('labs') }}">Labs</a></li>
+          <li><a href="http://www.github.com/ianonavy">Code</a></li>
         </ul>
       </nav>
     </header>
@@ -57,6 +40,17 @@
     <footer id="footer">
       {% block footer %}Copyright &copy; 2014 Ian Adam Naval. All rights reserved.{% endblock footer %}
     </footer>
-  </body>
 
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-33981209-1']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
+  </body>
 </html>
diff --git a/src/templates/index.html b/src/templates/index.html
index 3cff29b..57bf1f1 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -1,21 +1,19 @@
 {% extends "base.html" %}
 
-{% block nav_portfolio %} class="selected"    {% endblock %}
-{% block extrastyle %}<link rel="stylesheet" href="{{ url_for('static', filename='css/portfolio.css') }}" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{ url_for('static', filename='css/about.css') }}" type="text/css" media="screen" />{% endblock %}
+{% block extrastyle %}<link rel="stylesheet" href="{{ url_for('static', filename='css/portfolio.css') }}" type="text/css" media="screen" />{% endblock %}
 
 {% block main %}
 
-      <section id="portfolio">
+      <div id="portfolio">
         <h2>Portfolio</h2>
         <p><a class="button" href='http://files.ianonavy.com/resume.pdf'>View Resume</a></p>
-      </section>
+      </div>
 
-      <section id="about">
+      <div id="about">
         <h2>About</h2>
         <img id="me" src="{{ url_for('static', filename='img/ian.jpg') }}" alt="Picture of Ian Naval" />
         
-        <div id="skills">
+        <div id="skills" class="about-section">
           <h3>Skills</h3>
           <ul>
             <li>Learns fast.</li>
@@ -27,7 +25,7 @@
             <li>Experience with Flask, Django, node.js, and AngularJS.</li>
           </ul>  
         </div>
-        <div id="about-me">
+        <div id="about-me" class="about-section">
           <h3>Facts</h3>
           <ul>
             <li>Likes potatoes, music and language.</li>
@@ -35,11 +33,11 @@
             <li>Does not own those glasses.</li>
           </ul>
         </div>
-      </section>
+      </div>
 
-      <section id="contact">
+      <div id="contact">
         <h2>Contact</h2>
-        <p>See my <a href='http://files.ianonavy.com/resume.pdf'>résumé</a>.</p>
-      </section>
+        <p>Information is on my <a href='http://files.ianonavy.com/resume.pdf'>résumé</a>.</p>
+      </div>
 
 {% endblock main %}
diff --git a/src/templates/labs.html b/src/templates/labs.html
index 64ed27e..071fbf9 100644
--- a/src/templates/labs.html
+++ b/src/templates/labs.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% block title %} | Labs{% endblock %}
-{% block nav_labs %} class="selected"    {% endblock %}
 
 {% block main %}
 	  <h2>Labs</h2>
@@ -9,5 +8,5 @@
       <p>Click <a href="http://demo.ianonavy.com/">here</a> to see what I'm
       	working on this very moment (if anything).</p>
       <h2>Active Projects</h2>
-      
+
 {% endblock main %}