diff --git a/content/css/_bootstrap.scss b/content/css/_bootstrap.scss
index 5017c5f..d7a437a 100755
--- a/content/css/_bootstrap.scss
+++ b/content/css/_bootstrap.scss
@@ -1052,6 +1052,7 @@ pre code {
}
}
+/*
@media (min-width: 992px) {
.container {
max-width: 940px;
@@ -1205,7 +1206,9 @@ pre code {
margin-left: 91.66666666666666%;
}
}
+*/
+/*
@media (min-width: 1200px) {
.container {
max-width: 1140px;
@@ -1359,6 +1362,7 @@ pre code {
margin-left: 91.66666666666666%;
}
}
+*/
table {
max-width: 100%;
@@ -5580,4 +5584,4 @@ td.visible-print {
td.hidden-print {
display: none !important;
}
-}
\ No newline at end of file
+}
diff --git a/content/css/screen.sass b/content/css/screen.sass
index 2f9d217..028e18b 100644
--- a/content/css/screen.sass
+++ b/content/css/screen.sass
@@ -3,16 +3,13 @@
@import "pygments"
$text-color: #696969
-$focus-color: #ff0000
+$focus-color: $peterriver
body
color: $text-color
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
font-weight: 400
-.container
- width: 720px
-
a, a:hover, a:active, a:visited
color: $focus-color
@@ -31,7 +28,7 @@ h1, h2, h3, h4, h5, h6
display: inline-block
h1
- padding-right: 0.4em
+ padding-right: 0.8em
a
color: darken($text-color, 15%)
@@ -44,29 +41,65 @@ h1, h2, h3, h4, h5, h6
li
display: inline-block
- padding-right: 0.4em
+ padding-right: 0.8em
+
+ .align-right
+ text-align: right
+
+ ol.social
+ margin-top: 15px
+
+ li
+ padding-right: 0
+ padding-left: 0.4em
+
+ a
+ font-size: 1.2em
+ color: $focus-color
#main
- #content
-
#adpacks
text-align: right
font-size: 0.8em
- #posts
- .post
+ .bsa_it_i
+ float: right
+ display: block
+ width: 130px
+ margin-bottom: 10px
+
+ .bsa_it_t,
+ .bsa_it_d
+ display: inline-block
+ clear: right
+ text-align: right
+ width: 130px
+ margin-bottom: 10px
+
+ .bsa_it_t
+ color: darken($text-color, 30%)
+
+ .bsa_it_d
+ color: $text-color
+
+ .bsa_it_p
+ display: none
+
+ a#bsap_aplink,
+ display: inline
+ color: lighten($text-color, 30%)
+
+ .post
+ h1.title
+ margin-top: 0
margin-bottom: 20px
- h2.title
- margin-top: 0
+ a
+ color: darken($text-color, 15%)
- a
- color: darken($text-color, 15%)
-
- .date
- margin-bottom: 0
-
- .summary
+ p.meta
+ margin-top: 20px
+ margin-bottom: 0
#footer
ul.tla
diff --git a/layouts/default.haml b/layouts/default.haml
index fd89887..e510e5b 100644
--- a/layouts/default.haml
+++ b/layouts/default.haml
@@ -19,31 +19,43 @@
%link(href="https://ariejan.net/rss.xml" rel="alternate" type="application/rss+xml" title="RSS")
%link(href="/css/screen.css" rel="stylesheet" type="text/css" media="screen")
+ %link(href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet")
%title= "#{@item[:title]} — ariejan de vroom"
%body
.container
.row#header
- .col-sm-12
+ .col-sm-9
%h1
%a(href="/") ariejan de vroom
%ol
- %li= link_to "home", "/"
%li= link_to "projects", "/projects/"
%li= link_to "craftsmanship", "/craftsmanship/"
%li= link_to "talks", "/talks/"
%li= link_to "about", "/about/"
- .row#main
- .col-sm-9
- #content
- = yield
+ .col-sm-3.align-right.hidden-xs
+ %ol.social
+ %li
+ %a(href="https://github.com/ariejan")
+ %i.icon-github
- .col-sm-3
- #adpacks
- .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881
- %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs
+ %li
+ %a(href="https://twitter.com/ariejan")
+ %i.icon-twitter
+
+ %li
+ %a(href="http://www.linkedin.com/in/ariejan")
+ %i.icon-linkedin
+
+ %li
+ %a(href="https://ariejan.net/rss.xml")
+ %i.icon-rss
+
+ .row#main
+ .col-sm-12
+ = yield
.row#footer
.col-sm-12
@@ -57,15 +69,6 @@
White Hat SEO
Medifast Coupon Code
- -#
- %nav#social
- %ol
- %li= link_to "github", "https://github.com/ariejan"
- %li= link_to "twitter", "https://twitter.com/ariejan"
- %li= link_to "linkedin", "http://www.linkedin.com/in/ariejan"
- %li= link_to "RSS", "https://ariejan.net/rss.xml"
- %li= link_to "Contact", "mailto:ariejan@ariejan.net"
-
:javascript
(function(){
var bsa = document.createElement('script');
diff --git a/layouts/post.haml b/layouts/post.haml
index a8e40c7..c85d26a 100644
--- a/layouts/post.haml
+++ b/layouts/post.haml
@@ -1,20 +1,27 @@
-%article.post
- %section#meta
- %h1= item[:title]
+.row
+ .col-sm-12
+ .post
+ %p.meta= get_pretty_date(item)
+ %h1.title= item[:title]
- %p.meta
- Written by Ariejan de Vroom on #{get_pretty_date(item)}.
+.row
+ .col-sm-9
+ .post
+ .body
+ = yield
- %section#body
- = yield
+ #comments
+ #disqus_thread
- %section#comments
- #disqus_thread
+ :javascript
+ var disqus_url = "#{url_for(item)}";
+ (function() {
+ var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ dsq.src = '//ariejannet.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ })();
- :javascript
- var disqus_url = "#{url_for(item)}";
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
- dsq.src = '//ariejannet.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
- })();
+ .col-sm-3.hidden-xs
+ #adpacks
+ .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881
+ %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs