Permalink
Browse files

more styles

  • Loading branch information...
adamcooke authored and root committed Dec 12, 2013
1 parent bf3cac3 commit 25f8dd3bd3cb8de9f143bf8733629c123bd8fc8e
Showing with 68 additions and 15 deletions.
  1. +40 −5 assets/css/screen.css
  2. +3 −6 assets/js/index.js
  3. +13 −2 default.hbs
  4. +1 −2 index.hbs
  5. +11 −0 page.hbs
View
@@ -19,7 +19,7 @@ nav.main {
nav.main div.inner {
position:fixed;
bottom:0;
- height:480px;
+ height:560px;
width:240px;
padding-left:40px;
}
@@ -59,6 +59,15 @@ nav.main div.inner ul.social li a b {
color:#afa29a;
}
+nav.main div.inner div.group.pages ul.social li a{
+ font-size:1.1em;
+}
+
+nav.main div.inner div.group.pages ul.social li a b{
+ color:#fff;
+}
+
+
/*
Header
*/
@@ -117,6 +126,10 @@ section.content section.welcome a {
border-bottom:1px solid #c1dbef;
}
+section.content section.welcome a.d9 {
+ white-space:nowrap;
+}
+
/*
Post content
*/
@@ -316,14 +329,24 @@ section.content footer.global {
#disqus_thread { margin-top:25px; }
+#disqus_thread a { color:#292422 }
+
/*
Small
*/
-@media all and (max-width:900px), (max-height:600px) {
+
+@media all and (max-height:650px) {
+ nav.main div.inner div.group.elsewhere { display:none; }
+ nav.main div.inner { height:400px; }
+}
+
+
+
+@media all and (max-width:900px), (max-height:500px) {
nav.main { position:relative; background:#F8F5F3; width:inherit;border-bottom:1px solid #ded1c9;}
nav.main div.inner { position:relative;height:inherit; padding:20px 40px; overflow:hidden; width:inherit;}
nav.main div.inner h2 { color:#292422;}
- nav.main div.inner ul.social li a b { color:#292422; }
+ nav.main div.inner div.group ul.social li a b { color:#292422 !important; }
nav.main div.inner div.group { float:left;clear:none; margin-top:0; margin-right:60px;}
nav.main div.inner div.group:last-child { margin-right:0;}
header.main {background-color:#292422; width:inherit; padding:20px 40px; height:inherit; position:relative;}
@@ -333,11 +356,23 @@ section.content footer.global {
section.content { margin-left:0; padding:40px;}
}
-@media all and (max-width:575px) {
+@media all and (max-width:820px) {
+ nav.main div.inner div.group.elsewhere { display:none; }
+ nav.main div.inner div.group.companies {margin-right:0;}
+}
+
+@media all and (max-width:560px) {
+ nav.main div.inner div.group.companies { display:none; }
+}
+
+@media all and (max-width:400px) {
section.content { padding:20px;}
nav.main div.inner { padding:20px 20px;}
- nav.main div.inner div.group:last-child { display:none; }
+ nav.main div.inner div.group.companies { display:none; }
header.main { padding:20px; }
header.main h1 { float:none;}
header.main p { display:none; }
+ section.content section.welcome { font-size:1.3em; }
+ section.content article.home.post p.meta { font-size:0.9em; }
+ section.content article.home.post h2 a { font-size:1.3em; }
}
View
@@ -7,12 +7,9 @@
"use strict";
$(document).ready(function(){
-
- // On the home page, move the blog icon inside the header
- // for better relative/absolute positioning.
-
- //$("#blog-logo").prependTo("#site-head-content");
+ $("a[href^='http://']").attr("target","_blank");
+ $("a[href^='https://']").attr("target","_blank");
});
-}(jQuery));
+}(jQuery));
View
@@ -10,6 +10,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="stylesheet" type="text/css" href="/assets/css/screen.css" />
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+ <script type="text/javascript" src="/assets/js/index.js"></script>
<script type="text/javascript" src="//use.typekit.net/vym1trm.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
@@ -23,7 +25,16 @@
<nav class='main'>
<div class='inner'>
- <div class='group'>
+ <div class='group pages'>
+ <ul class='social'>
+ <li><a href='/'><b>My blog</b> - my rambling blog posts</a></li>
+ <li><a href='/me/'><b>About me</b> - a little about me</a></li>
+ <li><a href='/projects/'><b>Things I've done</b> - a projects list</a></li>
+ <li><a href='/opensource/'><b>Open source projects</b> - giving back</a></li>
+ </ul>
+
+ </div>
+ <div class='group companies'>
<h2>My Companies</h2>
<ul class='social'>
<li><a href='http://atechmedia.com'><b>aTech Media</b> - software development</a></li>
@@ -32,7 +43,7 @@
<li><a href='http://fusionwifi.com'><b>FusionWiFi</b> - business WiFi solutions</a></li>
</ul>
</div>
- <div class='group'>
+ <div class='group elsewhere'>
<h2>Elsewhere</h2>
<ul class='social'>
<li><a href='http://twitter.com/adamcooke'>Follow me on <b>Twitter</b></a></li>
View
@@ -2,8 +2,7 @@
<section class='welcome'>
<p>
- <b>Greetings!</b> I'm Adam and I'm a software <a href='http://github.com/adamcooke'>developer</a> &amp; <a href='http://dribbble.com/adamcooke'>designer</a> and managing director of <a href='http://atechmedia.com'>aTech Media</a>, <a href='http://viaduct.io'>Viaduct</a> &amp; <a href='http://dial9.co.uk'>Dial 9</a>.
- This blog contains articles about development, design, small businesses and more!
+ <b>Greetings!</b> <a href='/me/'>I'm Adam</a> and I'm a UK-based <a href='/projects/'>software developer &amp; designer</a> as well as being managing director of <a href='http://atechmedia.com'>aTech Media</a>, <a href='http://viaduct.io'>Viaduct</a> &amp; <a href='http://dial9.co.uk' class='d9'>Dial 9</a>.
</p>
</section>
View
@@ -0,0 +1,11 @@
+{{!< default}}
+<main class="content" role="main">
+ <article class="{{post_class}}">
+ {{#post}}
+ <h1 class="title">{{{title}}}</h1>
+ <section class="post-content">
+ {{content}}
+ </section>
+ {{/post}}
+ </article>
+</main>

0 comments on commit 25f8dd3

Please sign in to comment.