From 74038afd752e80e247dc9f085f01fb240f8dfea7 Mon Sep 17 00:00:00 2001 From: Ariejan de Vroom Date: Thu, 25 Jul 2013 07:35:02 +0200 Subject: [PATCH] wip --- Rules | 2 + content/css/_colours.sass | 5 + content/css/_flat-ui-colors.sass | 20 + content/css/_layout.sass | 24 + content/css/_reset.scss | 2 + content/css/_typography.sass | 13 + content/css/font-awesome/font-awesome.scss | 534 --------------------- content/css/screen.sass | 39 +- layouts/default.haml | 26 +- layouts/post.haml | 9 +- 10 files changed, 98 insertions(+), 576 deletions(-) create mode 100644 content/css/_colours.sass create mode 100644 content/css/_flat-ui-colors.sass create mode 100644 content/css/_layout.sass create mode 100644 content/css/_reset.scss create mode 100644 content/css/_typography.sass delete mode 100644 content/css/font-awesome/font-awesome.scss diff --git a/Rules b/Rules index 074e7d0..ccfe478 100644 --- a/Rules +++ b/Rules @@ -1,6 +1,8 @@ #!/usr/bin/env ruby SASS_LOAD_PATHS = [ + 'content/css', + File.join(`bundle show compass`.chomp, *%w[frameworks compass stylesheets]), File.join(`bundle show bourbon`.chomp, *%w[app assets stylesheets]), File.join(`bundle show neat`.chomp, *%w[app assets stylesheets]) ] diff --git a/content/css/_colours.sass b/content/css/_colours.sass new file mode 100644 index 0000000..e17cc98 --- /dev/null +++ b/content/css/_colours.sass @@ -0,0 +1,5 @@ +body + background-color: #666 + +section#page + background-color: #ffffff diff --git a/content/css/_flat-ui-colors.sass b/content/css/_flat-ui-colors.sass new file mode 100644 index 0000000..a580a51 --- /dev/null +++ b/content/css/_flat-ui-colors.sass @@ -0,0 +1,20 @@ +$turquoise: #1ABC9C +$greensea: #16A085 +$emerland: #2ECC71 +$nephritis: #27AE60 +$peterriver: #3498DB +$belizehole: #2980B9 +$amethyst: #9B59B6 +$wisteria: #8E44AD +$wetasphalt: #34495E +$midnightblue: #2C3E50 +$sunflower: #F1C40F +$orange: #F39C12 +$carrot: #E67E22 +$pumpkin: #D35400 +$alizarin: #E74C3C +$pomegranate: #C0392B +$clouds: #ECF0F1 +$silver: #BDC3C7 +$concrete: #95A5A6 +$asbestos: #7F8C8D diff --git a/content/css/_layout.sass b/content/css/_layout.sass new file mode 100644 index 0000000..838b2d9 --- /dev/null +++ b/content/css/_layout.sass @@ -0,0 +1,24 @@ +$mobile: new-breakpoint(max-width 480px) + +section#page + @include outer-container + + header + @include span-columns(12) + @include rhythm + + section#main + section#content + @include span-columns(8) + + @include media($mobile) + @include span-columns(12) + + aside#sidebar + @include span-columns(4) + + @include media($mobile) + @include span-columns(12) + + footer + @include span-columns(12) diff --git a/content/css/_reset.scss b/content/css/_reset.scss new file mode 100644 index 0000000..92f33c9 --- /dev/null +++ b/content/css/_reset.scss @@ -0,0 +1,2 @@ +/** * YUI 3.5.0 - reset.css (http://developer.yahoo.com/yui/3/cssreset/) * http://cssreset.com * Copyright 2012 Yahoo! Inc. All rights reserved. * http://yuilibrary.com/license/ *//* TODO will need to remove settings on HTML since we can't namespace it. TODO with the prefix, should I group by selector or property for weight savings?*/html{ color:#000; background:#FFF;}/* TODO remove settings on BODY since we can't namespace it.*//* TODO test putting a class on HEAD. - Fails on FF. */body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td { margin:0; padding:0;}table { border-collapse:collapse; border-spacing:0;}fieldset,img { border:0;}/* TODO think about hanlding inheritence differently, maybe letting IE6 fail a bit...*/address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal;} ol,ul { list-style:none;} caption,th { text-align:left;}h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal;}q:before,q:after { content:'';}abbr,acronym { border:0; font-variant:normal;}/* to preserve line-height and selector appearance */sup { vertical-align:text-top;}sub { vertical-align:text-bottom;}input,textarea,select { font-family:inherit; font-size:inherit; font-weight:inherit;}/*to enable resizing for IE*/input,textarea,select { *font-size:100%;}/*because legend doesn't inherit in IE */legend { color:#000;}/* YUI CSS Detection Stamp */#yui3-css-stamp.cssreset { display: none; } + diff --git a/content/css/_typography.sass b/content/css/_typography.sass new file mode 100644 index 0000000..6576ccd --- /dev/null +++ b/content/css/_typography.sass @@ -0,0 +1,13 @@ +$base-font-size: 13px +$base-line-height: 18px + +@import "compass/typography" + +@include establish-baseline + +html + font-family: $helvetica + +#title + h1 + @include adjust-font-size-to(36px) diff --git a/content/css/font-awesome/font-awesome.scss b/content/css/font-awesome/font-awesome.scss deleted file mode 100644 index 92ade8d..0000000 --- a/content/css/font-awesome/font-awesome.scss +++ /dev/null @@ -1,534 +0,0 @@ -/*! - * Font Awesome 3.0.2 - * the iconic font designed for use with Twitter Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ - * - * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - * http://opensource.org/licenses/mit-license.html - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ - * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - * - * Contact - * ------------------------------------------------------- - * Email: dave@davegandy.com - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com - */ - -$fontAwesomePath: "../font" !default; -$borderColor: #eee; -$iconMuted: #eee; -@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; } - - -@font-face { - font-family: 'FontAwesome'; - src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?v=3.0.1'); - src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format("embedded-opentype"), - url('#{$fontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format("woff"), - url('#{$fontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format("truetype"); - font-weight: normal; - font-style: normal; -} - -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"], -[class*=" icon-"] { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - - /* sprites.less reset */ - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -/* more sprites.less reset */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; -} - -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; -} - -/* makes sure icons active on rollover in links */ -a { - [class^="icon-"], - [class*=" icon-"] { - display: inline-block; - } -} - -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} - -.btn, .nav { - [class^="icon-"], - [class*=" icon-"] { - display: inline; - /* keeps button heights with and without icons the same */ - &.icon-large { line-height: .9em; } - &.icon-spin { display: inline-block; } - } -} - -.nav-tabs, .nav-pills { - [class^="icon-"], - [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - &, &.icon-large { line-height: .9em; } - } -} - -li, .nav li { - [class^="icon-"], - [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; - &.icon-large { - /* increased font size for icon-large */ - width: 1.5625em; - } - } -} - -ul.icons { - list-style-type: none; - text-indent: -.75em; - - li { - [class^="icon-"], - [class*=" icon-"] { - width: .75em; - } - } -} - -.icon-muted { - color: $iconMuted; -} - -// Icon Borders -// ------------------------- - -.icon-border { - border: solid 1px $borderColor; - padding: .2em .25em .15em; - @include border-radius(3px); -} - -// Icon Sizes -// ------------------------- - -.icon-2x { - font-size: 2em; - &.icon-border { - border-width: 2px; - @include border-radius(4px); - } -} -.icon-3x { - font-size: 3em; - &.icon-border { - border-width: 3px; - @include border-radius(5px); - } -} -.icon-4x { - font-size: 4em; - &.icon-border { - border-width: 4px; - @include border-radius(6px); - } -} - -// Floats -// ------------------------- - -// Quick floats -.pull-right { float: right; } -.pull-left { float: left; } - -[class^="icon-"], -[class*=" icon-"] { - &.pull-left { - margin-right: .3em; - } - &.pull-right { - margin-left: .3em; - } -} - -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .18em; } - } - &.icon-spin.icon-large { line-height: .8em; } - } -} - -.btn.btn-small { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .25em; } - } - } -} - -.btn.btn-large { - [class^="icon-"], - [class*=" icon-"] { - margin-top: 0; // overrides bootstrap default - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .05em; } - } - &.pull-left.icon-2x { margin-right: .2em; } - &.pull-right.icon-2x { margin-left: .2em; } - } -} - - -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -@-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } -} -@-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } -} -@-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } -} -@-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} - -@-moz-document url-prefix() { - .icon-spin { height: .9em; } - .btn .icon-spin { height: auto; } - .icon-spin.icon-large { height: 1.25em; } - .btn .icon-spin.icon-large { height: .75em; } -} - -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } -.icon-lightbulb:before { content: "\f0eb"; } -.icon-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { content: "\f0ee"; } - -.icon-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { content: "\f0f3"; } -.icon-coffee:before { content: "\f0f4"; } -.icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { content: "\f0f6"; } -.icon-building:before { content: "\f0f7"; } -.icon-hospital:before { content: "\f0f8"; } -.icon-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { content: "\f0fc"; } -.icon-h-sign:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { content: "\f0fe"; } - -.icon-double-angle-left:before { content: "\f100"; } -.icon-double-angle-right:before { content: "\f101"; } -.icon-double-angle-up:before { content: "\f102"; } -.icon-double-angle-down:before { content: "\f103"; } -.icon-angle-left:before { content: "\f104"; } -.icon-angle-right:before { content: "\f105"; } -.icon-angle-up:before { content: "\f106"; } -.icon-angle-down:before { content: "\f107"; } -.icon-desktop:before { content: "\f108"; } -.icon-laptop:before { content: "\f109"; } -.icon-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { content: "\f10b"; } -.icon-circle-blank:before { content: "\f10c"; } -.icon-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { content: "\f10e"; } - -.icon-spinner:before { content: "\f110"; } -.icon-circle:before { content: "\f111"; } -.icon-reply:before { content: "\f112"; } -.icon-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { content: "\f114"; } -.icon-folder-open-alt:before { content: "\f115"; } diff --git a/content/css/screen.sass b/content/css/screen.sass index 4145fcb..6198bd1 100644 --- a/content/css/screen.sass +++ b/content/css/screen.sass @@ -1,28 +1,19 @@ -$turquoise: #1ABC9C -$greensea: #16A085 -$emerland: #2ECC71 -$nephritis: #27AE60 -$peterriver: #3498DB -$belizehole: #2980B9 -$amethyst: #9B59B6 -$wisteria: #8E44AD -$wetasphalt: #34495E -$midnightblue: #2C3E50 -$sunflower: #F1C40F -$orange: #F39C12 -$carrot: #E67E22 -$pumpkin: #D35400 -$alizarin: #E74C3C -$pomegranate: #C0392B -$clouds: #ECF0F1 -$silver: #BDC3C7 -$concrete: #95A5A6 -$asbestos: #7F8C8D - -$border-radius: 6px - -@import "pygments" +@import "flat-ui-colors" @import "bourbon" @import "neat" +/* == Compass reset == */ +@import "compass/reset" + +/* == Typography == */ +@import "typography" + +/* == Layout == */ +@import "layout" + +/* == Colours and backgrounds == */ +@import "colours" + +/* == Pygments == */ +@import "pygments" diff --git a/layouts/default.haml b/layouts/default.haml index 14d5f6a..d20d35b 100644 --- a/layouts/default.haml +++ b/layouts/default.haml @@ -19,8 +19,6 @@ %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.1.1/css/font-awesome.css" type="text/css" rel="stylesheet") - %link(href="//fonts.googleapis.com/css?family=Lato:900|PT+Sans:400,700,400italic,700italic" type="text/css" rel="stylesheet") %title= "#{@item[:title]} — ariejan.net" @@ -38,14 +36,6 @@ %header#title %h1= link_to "ariejan.net", "https://ariejan.net/" - %nav#social - %ol - %li= link_to "", "https://github.com/ariejan" - %li= link_to "", "https://twitter.com/ariejan" - %li= link_to "", "http://www.linkedin.com/in/ariejan" - %li= link_to "", "https://ariejan.net/rss.xml" - %li= link_to "", "mailto:ariejan@ariejan.net" - %nav#primary %ol.interal %li= link_to "Home", "/" @@ -55,7 +45,21 @@ %li= link_to "About", "/about/" %section#main - = yield + %section#content + = yield + + %aside#sidebar + #adpack + .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881 + %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs + + %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" %footer .copyright diff --git a/layouts/post.haml b/layouts/post.haml index 92d6b34..a8e40c7 100644 --- a/layouts/post.haml +++ b/layouts/post.haml @@ -1,16 +1,11 @@ %article.post - %section#content-header + %section#meta %h1= item[:title] %p.meta Written by Ariejan de Vroom on #{get_pretty_date(item)}. - %section#content - %aside#adpack - .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881 - %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs - - %section#body + %section#body = yield %section#comments