Another massive commit:

1. Major improvements to the responsive styling.
2. Toggleable sidebar
3. Upgraded to modernizr 2.0 which includes Respond.js
4. IE7-9 testing and fixes
5. New theming system which should make forkers happy
6. New rake task for installing Octopress themes
7. Magic
This commit is contained in:
Brandon Mathis 2011-06-07 10:45:01 -04:00
parent 8698a276f9
commit d8b796acb9
68 changed files with 68 additions and 6890 deletions

View file

@ -1,17 +0,0 @@
@import "compass";
@include global-reset;
@include reset-html5;
/* SASS mixins */
//@import "library/typography";
/* primary SASS */
//@import "theme";
//@import "typography";
@import "themes/classic/style";
/* specific SASS */
//@import "partials";

View file

@ -1,12 +0,0 @@
//@import "partials/shared";
//@import "partials/search";
/* layout partials */
@import "partials/header";
@import "partials/navigation";
@import "partials/page";
@import "partials/sidebar";
@import "partials/blog";
@import "partials/footer";
@import "partials/syntax";

View file

@ -1,4 +0,0 @@
@import "core/theme";
@import "core/layout";
@import "core/typography";
@import "partials";

View file

@ -1,94 +0,0 @@
a {
color: $link_color;
&:hover, &:focus {
color: saturate(darken($link_color, 15), 20); }
&:visited {
color: darken(adjust_hue($link_color, 70), 10);
}
}
$min-width: 320px;
$max-width: 1440px;
$default-border-radius: 4px;
.group { @include pie-clearfix; }
.core-layout { > div { @extend .inner-wrap; } }
body {
> header, > nav, > footer {
@extend .core-layout;
min-width: $min-width;
}
}
@mixin media-layout($page-pad, $sidebar-width, $sidebar-pad) {
$side-nav: $sidebar-width - $page-pad - $sidebar-pad;
.inner-wrap {
padding: 0 $page-pad;
position: relative;
margin: 0 auto;
max-width: $max-width;
@extend .group;
}
body > nav + div {
@extend .group;
padding: 0;
max-width: $max-width + $page-pad*2;
margin: 0 auto;
> div {
@extend .group;
margin-right: $sidebar-width;
}
}
body > nav > div > div { width: $side-nav;
.search { width: $side-nav - 70px; }
}
#articles {
float: left;
width: 100%;
padding-top: 25px;
padding-bottom: 25px;
> * {
padding-right: $page-pad;
padding-left: $page-pad;
}
> article {
margin-bottom: 1.5em;
padding-bottom: 1.5em;
padding-right: $page-pad;
padding-left: $page-pad;
}
+ aside {
display: block;
float: left;
width: $sidebar-width - $sidebar-pad*2;
margin: 0 -100% 0 0;
padding: 0 $sidebar-pad $sidebar-pad;
}
}
}
@media only screen and (min-width: 320px) {
@import "../media/480";
}
@media only screen and (min-width: 768px) {
@include media-layout(15px, 240px, 15px);
@import "../media/768";
}
@media only screen and (min-width: 992px) {
@include media-layout(40px, 320px, 30px);
@import "../media/992";
}
//*{
//transition: width .5s;
//-moz-transition: width .5s;
//-webkit-transition: margin .5s;
//}

View file

@ -1,44 +0,0 @@
// Link Colors
$link-color: lighten(#165b94, 3);
$link-color-hover: darken(#165b94, 5);
// Main Section Colors
$body-color: #333333;
$light-text: #999999;
$body-bg: #323232;
$header-bg: #323232;
$header-border: #181818;
$title-color: #dddddd;
$nav-color: #555555;
$nav-color_hover: black;
$nav-bg: #e8e8e8;
$nav-border_top: white;
$nav-border_bottom: #aaaaaa;
$nav-border_left: #cccccc;
$nav-border_right: white;
$sidebar-bg: #f2f2f2;
$sidebar-border: #d5d5d5;
// Blog
$article-border: #eeeeee;
$main-bg: #fff;
$footer-color: #999999;
$footer-bg: #444444;
// Form Colors
$fieldset-bg: #ececec;
$fieldset-border: #c3c3c3;
$textinput-color: #333333;
$textinput-bg: #f4f4f4;
$textinput-bg-focus: #fefeee;
$textinput-border-top: #aaaaaa;
$textinput-border-bottom: #c6c6c6;
$textinput-border-left: #c3c3c3;
$textinput-border-right: #c3c3c3;
$textinput-border-focus: #989898;

View file

@ -1,155 +0,0 @@
$type-border: #ddd;
$type-color-light: #555;
$type-color: #000;
$blockquote: $type-border !default; //darken($type-border, 20) !default;
$mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
// Fonts
@include font-face("Adelle", font-files("adellebasic_bold-webfont.woff", woff, "adellebasic_bold-webfont.ttf", truetype, "adellebasic_bold-webfont.svg#webfontKykxqSyz", svg), $eot: "adellebasic_bold-webfont.eot" );
.heading { font-family: Adelle, "Helvetica Neue", Arial, sans-serif; }
.sans { font-family: "Helvetica Neue", Arial, sans-serif; }
.mono { font-family: $mono; }
body > header h1 {
font-size: 3em;
@extend .heading;
line-height: 1.2em;
margin-bottom: 0.6667em;
}
body {
font-size: 1em;
line-height: 1.5em;
color: $type-color;
font-family: Georgia, Times, serif;
}
article {
&:last-child { border-bottom: none; }
h2 {
padding-top: 0.8em;
border-top: 3px double $type-border;
}
.byline + time:before, .byline + time +time:before {
content: "\2022 ";
padding: 0 .3em 0 .2em;
display: inline-block;
@include opacity(.5);
}
time span {
font-size: .7em;
line-height: 0;
position: relative;
top: -.4em;
}
header {
p {
padding: 0 0 1.5em;
font-size: .8em;
color: $type-color-light;
font-family: Palatino, Times, "Times New Roman";
margin-top: -1.4em;
}
}
}
#{headings()}{
@extend .heading; font-weight: normal;
line-height: 1em;
text-rendering: optimizelegibility;
}
h1 {
font-size: 2.6em;
margin-bottom: 0.6667em;
}
h2, section h1 {
font-size: 1.8em;
margin-bottom: 0.6667em;
}
h3, section h2, section section h1 {
font-size: 1.6em;
margin-bottom: 0.875em;
}
h4, section h3, section section h2, section section section h1 {
font-size: 1.3em;
margin-bottom: 0.875em;
}
h5, section h4, section section h3 {
font-size: 1.1em;
margin-bottom: 0.75em;
}
h6, section h5, section section h4, section section section h3 {
font-size: 1em;
margin-bottom: 0.5em;
}
p, blockquote, ul, ol { margin-bottom: 1.5em; }
ul{ list-style-type: disc; }
ol{ list-style-type: decimal; ol { list-style-type: lower-alpha; } }
ul ul, ol ol { margin-left: 1.75em; }
li { margin-bottom: .5em; }
strong { font-weight: bold; }
em { font-style: italic; }
sup, sub { font-size: 0.8em; position: relative; display: inline-block; }
sup { top: -.5em; }
sub { bottom: -.5em; }
q { font-style: italic;
&:before { content: "\201C"; }
&:after { content: "\201D"; }
}
em, dfn { font-style: italic; }
strong, dfn { font-weight: bold; }
del, s { text-decoration: line-through; }
abbr, acronym { border-bottom: 1px dotted; cursor: help; }
pre, code, tt { @extend .mono-font; }
sub, sup { line-height: 0; }
hr { margin-bottom: 0.2em; }
small { font-size: .8em; }
big { font-size: 1.2em; }
blockquote {
$bq-margin: 2em;
font-style: italic;
position: relative;
margin-left: $bq-margin;
> p {
&:first-child:before {
content: "\201C";
position: absolute;
top: 0.1em;
left: -.7em;
font-size: 3em;
color: $blockquote;
}
&:last-child:after {
content: "\201D";
position: relative;
top: 0.3em;
line-height: 0;
font-size: 2em;
color: $blockquote;
}
}
+ p > cite {
margin-left: $bq-margin;
text-align: right;
&:before { content: ' '; color: $type-color-light; }
a { font-style: italic; }
}
}

View file

@ -1,16 +0,0 @@
body {
> header, > nav, > footer {
> div {
padding-left: .5em;
padding-right: .5em;
}
}
> header { font-size: .7em; padding: .5em 0; }
}
#articles { font-size: .9em; line-height: 1.5em;
> article { padding: .5em; }
+ aside { display: none; }
}
body > nav > div > div { width: 180px;
.search { width: 110px; }
}

View file

@ -1,16 +0,0 @@
body > header, body #articles {
font-size: .95em;
}
//body {
//> header, > nav, > footer {
//> div { padding: 0 15px; }
//}
//}
//#page > div {
//margin-right: 0;
//#main { float: none; }
//> aside { margin: 0; float: none; }
//}
//page > div > aside { float: none; }
//#main > * { padding-left: 15px; padding-right: 15px; }

View file

@ -1,3 +0,0 @@
body > header, body #articles {
font-size: 1.05em;
}

View file

@ -1,20 +0,0 @@
article {
.title {
text-decoration: none;
&:hover {
text-decoration: underline; } }
.entry {
border-bottom: 1px solid $article-border;
&:first-child {
padding-top: 0; } }
#disqus_thread { }
.meta {
border-bottom: 1px dashed #dddddd;
text-transform: uppercase;
color: #777777;
padding: 8px 0 5px;
margin-bottom: 1.5em;
font-size: 75%;
letter-spacing: 1px; }
.footer {
padding-top: 15px; } }

View file

@ -1,11 +0,0 @@
footer {
@include background(linear-gradient(darken($body-bg, 5), $body-bg));
//color: $footer-color;
//border-top: 10px solid $footer-bg;
padding: 15px 0;
position: relative;
z-index: 2;
a {
color: #dddddd;
&:hover {
color: white; } } }

View file

@ -1,13 +0,0 @@
body > header {
background-color: $header_bg;
border-bottom: 1px solid $header_border;
h1 {
display: inline-block;
margin: 0;
a, a:visited {
font-weight: normal;
color: $title_color;
text-decoration: none;
}
}
}

View file

@ -1,67 +0,0 @@
body > nav {
> div > div {
float: right;
position: relative;
padding: .45em 0 0 0;
a {
float: right;
@include replace-text-with-dimensions('rss.png');
}
form {
margin: 0; padding: 0;
@include background-clip(padding-box);
input[type='text']{
margin: 0;
@include border-radius(1em);
float: left;
border: 1px solid #ccc;
color: #888;
background: image-url('search.png') no-repeat .5em .4em #f6f6f6;
padding: .4em .8em .1em 1.8em;
line-height: 1.35em;
font-size: .85em;
&:focus {
color: #444;
border-color: #80b1df;
@include box-shadow(#80b1df 0 0 4px, #80b1df 0 0 3px inset);
background-color: #fff;
outline: none;
}
}
}
}
@extend .group;
position: relative;
z-index: 1;
background-color: $nav-bg;
@include background-image(linear-gradient(#fcfcfc, #f4f4f4 0.3, #dddddd));
border: {
top: 1px solid $nav-border-top;
bottom: 1px solid $nav-border-bottom; };
ul {
position: relative;
@include horizontal-list;
margin: 0 auto;
padding: .5em 0;
}
ul li {
padding: 0 1em;
margin: 0;
border-left: 1px solid $nav-border-left;
border-right: 1px solid $nav-border-right;
&:first-child {
border-left: none;
padding-left: 0; }
&:last-child {
border-right: 0; }
a {
display: inline-block;
color: $nav-color;
line-height: 150%;
text-decoration: none;
&:hover {
color: $nav-color-hover;
}
}
}
}

View file

@ -1,8 +0,0 @@
body {
background-color: $sidebar_bg;
}
body > div > div {
background-color: $main_bg; border-right: 1px solid $sidebar_border;
//@include box-shadow(rgba(#000, .1) 0 0 18px);
}

View file

@ -1,15 +0,0 @@
#pinboard_linkroll {
.pin-title, .pin-description {
display: block;
margin-bottom: .5em;
}
.pin-tag {
@extend .aside-alt-link;
&:after {
content: ',';
}
&:last-child:after {
content: '';
}
}
}

View file

@ -1,54 +0,0 @@
.side-shadow-border {
@include box-shadow(#fff 0 1px);
}
#articles + aside {
section {
@extend .sans;
font-size: .8em;
line-height: 1.5em;
margin-bottom: 1.5em;
h1 {
margin: 1.5em 0 0;
padding-bottom: .2em;
border-bottom: 1px solid #ddd;
@extend .side-shadow-border;
+ p {
padding-top: .4em;
}
}
}
ul {
margin-bottom: 0.5em;
}
li {
list-style: none;
padding: .5em 0;
margin: 0;
border-bottom: 1px solid #ddd;
@extend .side-shadow-border;
p:last-child {
margin-bottom: 0;
}
}
a {
color: inherit;
@include transition(color, .5s);
}
&:hover a, &:hover #tweets a { color: $link-color; }
@import "twitter";
@import "pinboard";
#recent_posts {
time {
text-transform: uppercase;
font-size: .9em;
color: #666;
}
}
}
.aside-alt-link {
color: #999;
text-decoration: none;
&:hover {
color: #555;
}
}

View file

@ -1,167 +0,0 @@
$base03: #002b36; //darkest blue
$base02: #073642; //dark blue
$base01: #586e75; //darkest gray
$base00: #657b83; //dark gray
$base0: #839496; //medium gray
$base1: #93a1a1; //medium light gray
$base2: #eee8d5; //cream
$base3: #fdf6e3; //white
$yellow: #b58900;
$orange: #cb4b16;
$red: #dc322f;
$magenta: #d33682;
$violet: #6c71c4;
$blue: #268bd2;
$cyan: #2aa198;
$green: #859900;
// If you prefer light colors, uncomment the following block to change themes
//$base03: $base3;
//$base02: $base2;
//$base01: $base1;
//$base00: $base0;
//$base0: $base00;
//$base1: $base01;
//$base2: $base02;
//$base3: $base03;
.gutter {
.line-numbers {
text-align: right;
background: $base02 !important;
border-right: 1px solid darken($base03, 2);
@include box-shadow(lighten($base02, 2) -1px 0 inset);
text-shadow: darken($base02, 10) 0 -1px;
span { color: $base01 !important; }
}
}
html .gist .gist-file {
margin-bottom: 1.5em;
border: none;
.gist-syntax {
border-bottom: 1px solid #515151 !important;
.gist-highlight{
background: $base03 !important;
pre {
@extend .pre;
overflow-y: hidden;
overflow-x: auto;
}
}
}
.gist-meta {
@include background(linear-gradient(#b0b0b0, #a7a7a7));
padding: 0.5em;
background-color: #bababa !important;
border: 1px solid #9c9c9c;
border-top: 1px solid #d0d0d0;
border-bottom: 1px solid #777777;
font-size: .7em !important;
font-family: "Helvetica Neue", Arial, sans-serif !important;
color: #464646 !important;
line-height: 1.4em;
}
}
pre { @extend .pre; }
.pre {
@extend .mono;
font-size: .8em;
line-height: 1.45em;
padding: 1em 1.2em !important;
background: $base03 !important;
color: $base1 !important;
span { color: $base1 !important; }
span { font-style: normal !important; font-weight: normal !important; }
.c { color: $base01 !important; font-style: italic !important; } /* Comment */
.cm { color: $base01 !important; font-style: italic !important; } /* Comment.Multiline */
.cp { color: $base01 !important; font-style: italic !important; } /* Comment.Preproc */
.c1 { color: $base01 !important; font-style: italic !important; } /* Comment.Single */
.cs { color: $base01 !important; font-weight: bold !important; font-style: italic !important; } /* Comment.Special */
.err { color: $red !important; background: none !important; } /* Error */
.k { color: $orange !important; } /* Keyword */
.o { color: $base1 !important; font-weight: bold !important; } /* Operator */
.p { color: $base1 !important; } /* Operator */
.ow { color: $cyan !important; font-weight: bold !important; } /* Operator.Word */
.gd { color: $base1 !important; background-color: mix($red, $base03, 25%) !important; display: block; } /* Generic.Deleted */
.gd .x { color: $base1 !important; background-color: mix($red, $base03, 35%) !important; display: block; } /* Generic.Deleted.Specific */
.ge { color: $base1 !important; font-style: italic !important; } /* Generic.Emph */
//.gr { color: #aa0000 } /* Generic.Error */
.gh { color: $base01 !important; } /* Generic.Heading */
.gi { color: $base1 !important; background-color: mix($green, $base03, 20%) !important; display: block; } /* Generic.Inserted */
.gi .x { color: $base1 !important; background-color: mix($green, $base03, 40%) !important; display: block; } /* Generic.Inserted.Specific */
//.go { color: #888888 } /* Generic.Output */
//.gp { color: #555555 } /* Generic.Prompt */
.gs { color: $base1 !important; font-weight: bold !important; } /* Generic.Strong */
.gu { color: $violet !important; } /* Generic.Subheading */
//.gt { color: #aa0000 } /* Generic.Traceback */
.kc { color: $green !important; font-weight: bold !important; } /* Keyword.Constant */
.kd { color: $blue !important; } /* Keyword.Declaration */
.kp { color: $orange !important; font-weight: bold !important; } /* Keyword.Pseudo */
.kr { color: $magenta !important; font-weight: bold !important; } /* Keyword.Reserved */
.kt { color: $cyan !important; } /* Keyword.Type */
.n { color: $blue !important; }
.na { color: $blue !important; } /* Name.Attribute */
.nb { color: $green !important; } /* Name.Builtin */
//.nc { color: #445588; font-weight: bold } /* Name.Class */
.no { color: $yellow !important; } /* Name.Constant */
//.ni { color: #800080 } /* Name.Entity */
.ne { color: $blue !important; font-weight: bold !important; } /* Name.Exception */
.nf { color: $blue !important; font-weight: bold !important; } /* Name.Function */
.nn { color: $yellow !important; } /* Name.Namespace */
.nt { color: $blue !important; font-weight: bold !important; } /* Name.Tag */
.nx { color: $yellow !Important; }
//.bp { color: #999999 } /* Name.Builtin.Pseudo */
//.vc { color: #008080 } /* Name.Variable.Class */
.vg { color: $blue !important; } /* Name.Variable.Global */
.vi { color: $blue !important; } /* Name.Variable.Instance */
.nv { color: $blue !important; } /* Name.Variable */
//.w { color: #bbbbbb } /* Text.Whitespace */
.mf { color: $cyan !important; } /* Literal.Number.Float */
.m { color: $cyan !important; } /* Literal.Number */
.mh { color: $cyan !important; } /* Literal.Number.Hex */
.mi { color: $cyan !important; } /* Literal.Number.Integer */
//.mo { color: #009999 } /* Literal.Number.Oct */
.s { color: $cyan !important; } /* Literal.String */
//.sb { color: #d14 } /* Literal.String.Backtick */
//.sc { color: #d14 } /* Literal.String.Char */
.sd { color: $cyan !important; } /* Literal.String.Doc */
.s2 { color: $cyan !important; } /* Literal.String.Double */
.se { color: $red !important; } /* Literal.String.Escape */
//.sh { color: #d14 } /* Literal.String.Heredoc */
.si { color: $blue !important; } /* Literal.String.Interpol */
//.sx { color: #d14 } /* Literal.String.Other */
.sr { color: $cyan !important; } /* Literal.String.Regex */
.s1 { color: $cyan !important; } /* Literal.String.Single */
//.ss { color: #990073 } /* Literal.String.Symbol */
//.il { color: #009999 } /* Literal.Number.Integer.Long */
}
.highlight {
margin-bottom: 1.5em;
overflow-y: hidden;
.gutter pre {
padding-left: .8em !important;
padding-right: .8em !important;
}
}
h3.filename {
font-size: 13px;
line-height: 2em;
text-align: center;
text-shadow: #cbcccc 0 1px 0;
color: #474747;
font-style: normal;
margin-bottom: 0;
@include border-top-radius(5px);
font-family: "Helvetica Neue",Arial, "Lucida Grande", "Lucida Sans Unicode", Lucida, sans-serif;
background: #aaaaaa image-url("code_bg.png") top repeat-x;
border: 1px solid #565656;
border-top-color: #cbcbcb;
border-left-color: #a5a5a5;
border-right-color: #a5a5a5;
border-bottom: 0;
}

View file

@ -1,49 +0,0 @@
#tweets {
a {
color: #666;
text-decoration: none;
&:hover { text-decoration: underline; }
}
li:hover a[href*='status']{
color: #666;
}
p {
position: relative;
padding-right: 1.4em;
}
a[href*='status']{
color: #ccc;
position: absolute;
top: 0;
right: -.5em;
text-decoration: none;
padding: 0 .5em .1em;
text-shadow: #fff 0 1px;
span:last-child {
display: none;
font-size: .7em;
}
span:first-child {
font-size: 1.1em;
}
&:hover {
span:first-child{ display: none; }
span:last-child{ display: inline-block; }
background: #e5e5e5;
@include box-shadow($sidebar-bg -2px 2px 8px 8px);
@include border-radius(1em);
text-decoration: none;
line-height: 1.2em;
span:last-child {
color: #444;
//text-shadow: #eee 0 1px;
}
}
}
a[href*='twitter.com/search']{
@extend .aside-alt-link;
&:hover {
text-decoration: underline;
}
}
}