Commits

Daniel Hemmingsen committed f513631

Added some sweetness (Aka Design)

  • Participants
  • Parent commits 43566b5

Comments (0)

Files changed (5)

File templates/layouts/base.html

 
 {% block page_title %}Demenza.me | Because I can!{% endblock %}
 
-{% block navigation %}<ul><li><a class="firstLink" href="/">Home</a></li><li><a href="/about/">About</a></li></ul>{% endblock %}
+{% block navigation %}<a class="first" href="/">Home</a><a href="#">Middle</a><a href="#">Middle</a><a href="#">Middle</a><a class="last" href="/about/">About</a>{% endblock %}
 
 {% block header %}<h1>Demenza.me</h1><p>Because I can!</p>{% endblock %}
 

File templates/layouts/css/style.css

 
 body, select, input, textarea { color: #444; }
 h1, h2, h3, h4, h5, h6 { font-weight: bold; }
-a, a:active, a:visited { color: #607890; }
-a:hover { color: #036; }
+/*a, a:active, a:visited { color: #607890; }*/
+/*a:hover { color: #036; }*/
 
 
 /**
  * Author: 
  */
 
+body {
+    background-image: url('/static/img/bgtexture.png');
+}
+
 .clearFix {
     float: none;
     clear: both;
 }
 
+a {
+    font-family: "droid-serif-1", "droid-serif-2", "arial";
+    color: #999;
+    text-decoration: none;
+
+}
+
 #container {
     margin: 0 auto;
     width: 800px;
 }
 
 header {
+    text-align: center;
     padding: 5px 10px;
     height: 50px;
+    margin: 25px 0;
 }
 
 header h1 {
-    font-size: 24px;
+    font-family: "lobster-1", "lobster-2", "helvetica";
+    color: #fff;
+    font-size: 34px;
+    text-shadow: 0 0 5px #000;
+    /*-webkit-text-stroke: 1px #777;*/
 }
 
 header p {
+    font-family: "droid-serif-1", "droid-serif-2", "arial";
     font-size: 16px;
+    color: #999;
 }
 
 nav {
-    -webkit-border-radius: 5px;
-    background-color: #CCC;
-    padding: 0 0 0 5px;
+    width: 100%;
+    text-align: center;
+    display: inline-block;
+    _display: inline;           /* IE is so dumb */
+    zoom:1;                     /* it is really really dumb */
+}
+
+nav .first {
+    -webkit-border-bottom-left-radius: 5px;
+    -webkit-border-top-left-radius: 5px;
+    color: #ececec;
+}
+
+nav .last {
+    -webkit-border-bottom-right-radius: 5px;
+    -webkit-border-top-right-radius: 5px;
+    color: #ececec;
 }
 
 nav a {
+    font-family: "droid-serif-1", "droid-serif-2", "helvetica";
+    color: #ececec;
+    padding: 5px;
     text-decoration: none;
     text-transform: uppercase;
+    background-color: #373737;
+    -webkit-box-shadow: 0 5px 0 #777;
 }
 
-nav ul li {
-    display: inline-block;
-    padding: 5px;
+nav a:hover {
+    color: #373737;
+    background-color: #e7e7e7;
 }
 
-nav li:hover {
-    padding: 5px;
+#wrapper {
+    -webkit-box-shadow: 0 0 10px #000;
+    -webkit-border-radius: 5px;
+    background-color: #fff;
 }
 
 #main {
+    margin: 20px 0;
     padding: 5px 10px;
     width: 560px;
     float: left;
 }
 
 #main h1 {
+    font-family: "lobster-1", "lobster-2", "helvetica";
     font-size: 18px;
 }
 
 #main p {
+    font-family: "droid-serif-1", "droid-serif-2", "arial";
     padding: 5px 10px;
 }
 
 }
 
 #sidebar {
+    margin: 20px 0;
     padding: 5px 10px;
     width: 200px;
     float: right;
 }
 
 #sidebar h1 {
+    font-family: "lobster-1", "lobster-2", "helvetica";
     font-size: 18px;
 }
 
 
 
 
-
-
-
-
-
-
-
 .ir { display: block; text-indent: -999em; overflow: hidden; background-repeat: no-repeat; text-align: left; direction: ltr; }
 .hidden { display: none; visibility: hidden; }
 .visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }

File templates/layouts/img/bgtexture.png

Added
New image

File templates/layouts/img/camobackground.png

Added
New image

File templates/layouts/site_base.html

 <!--[if IE 8 ]>    <html class="no-js ie8" lang="en"> <![endif]-->
 <!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-  <title>{% block page_title %}{% endblock %}</title>
-  <meta name="description" content="{% block site_desc %}{% endblock %}">
-  <meta name="author" content="{% block site_author %}{% endblock %}">
+    <title>{% block page_title %}{% endblock %}</title>
+    <meta name="description" content="{% block site_desc %}{% endblock %}">
+    <meta name="author" content="{% block site_author %}{% endblock %}">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="shortcut icon" href="/static/favicon.ico">
-  <link rel="apple-touch-icon" href="/static/apple-touch-icon.png">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="shortcut icon" href="/static/favicon.ico">
+    <link rel="apple-touch-icon" href="/static/apple-touch-icon.png">
 
-  <link rel="stylesheet" href="/static/css/style.css?v=2">
-  <script src="/static/js/libs/modernizr-1.7.min.js"></script>
+    <link rel="stylesheet" href="/static/css/style.css?v=2">
+    <script src="/static/js/libs/modernizr-1.7.min.js"></script>
+
+    <!-- REMOVED TYPEKIT FOR NOW -->
 
 </head>
 
     <header>
         {% block header %}{% endblock %}
     </header>
-    <nav>
-        {% block navigation %}{% endblock %}
-    </nav>
-    <div id="main" role="main">
-        {% block main %}{% endblock %}
-    </div>
-    <div id="sidebar" role="sidebar">
-        {% block sidebar %}{% endblock %}
-    </div>
-    <div class="clearFix"></div>
-    <footer>
-        {% block footer%}{% endblock %}
-    </footer>
+        <div id="nav">
+            <nav>
+                {% block navigation %}{% endblock %}
+            </nav>
+        </div>
+            <div id="wrapper">
+                <div id="main" role="main">
+                    {% block main %}{% endblock %}
+                </div>
+                <div id="sidebar" role="sidebar">
+                    {% block sidebar %}{% endblock %}
+                </div>
+                    <div class="clearFix"></div>    
+            </div>
+            <footer>
+                {% block footer%}{% endblock %}
+            </footer>
   </div> <!-- eo #container -->