diff options
author | Brandon Mathis <brandon@imathis.com> | 2011-05-15 18:33:00 -0400 |
---|---|---|
committer | Brandon Mathis <brandon@imathis.com> | 2011-05-15 18:33:00 -0400 |
commit | c7d5365f81552cae16bbb91696ca3e67b4a0a2e9 (patch) | |
tree | 76c57e41828a3492535cde7fe82bef98ccea0eb4 /source/sass | |
parent | e4c2d5790bac6a74037638fde049c374fc44cc7b (diff) | |
download | my_new_personal_website-c7d5365f81552cae16bbb91696ca3e67b4a0a2e9.tar.xz my_new_personal_website-c7d5365f81552cae16bbb91696ca3e67b4a0a2e9.zip |
major refactoring, improved file watching, changed site to public to support rack via pow (http://pow.cx) also implemented the basics of a 320 and up design refresh on the classic theme. This should make it great for mobile reading
Diffstat (limited to 'source/sass')
-rw-r--r-- | source/sass/screen.scss | 17 | ||||
-rw-r--r-- | source/sass/themes/classic/_partials.scss | 13 | ||||
-rw-r--r-- | source/sass/themes/classic/_style.scss | 4 | ||||
-rw-r--r-- | source/sass/themes/classic/core/_layout.scss | 91 | ||||
-rw-r--r-- | source/sass/themes/classic/core/_theme.scss | 45 | ||||
-rw-r--r-- | source/sass/themes/classic/core/_typography.scss | 159 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_blog.scss | 23 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_footer.scss | 11 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_header.scss | 11 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_navigation.scss | 30 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_page.scss | 8 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_search.scss | 19 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_shared.scss | 12 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_sidebar.scss | 38 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_syntax.scss | 279 | ||||
-rw-r--r-- | source/sass/themes/classic/partials/_twitter.scss | 15 |
16 files changed, 0 insertions, 775 deletions
diff --git a/source/sass/screen.scss b/source/sass/screen.scss deleted file mode 100644 index 4edf7422..00000000 --- a/source/sass/screen.scss +++ /dev/null @@ -1,17 +0,0 @@ -@import "compass"; -@import "compass/layout"; - -@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"; diff --git a/source/sass/themes/classic/_partials.scss b/source/sass/themes/classic/_partials.scss deleted file mode 100644 index c88faaac..00000000 --- a/source/sass/themes/classic/_partials.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import "partials/shared"; -@import "partials/syntax"; -@import "partials/search"; -@import "partials/sidebar"; -@import "partials/twitter"; - -/* layout partials */ -@import "partials/header"; -@import "partials/navigation"; -@import "partials/page"; -@import "partials/sidebar"; -@import "partials/blog"; -@import "partials/footer"; diff --git a/source/sass/themes/classic/_style.scss b/source/sass/themes/classic/_style.scss deleted file mode 100644 index f36aaa18..00000000 --- a/source/sass/themes/classic/_style.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import "core/layout"; -@import "core/theme"; -@import "core/typography"; -//@import "partials"; diff --git a/source/sass/themes/classic/core/_layout.scss b/source/sass/themes/classic/core/_layout.scss deleted file mode 100644 index 265af3af..00000000 --- a/source/sass/themes/classic/core/_layout.scss +++ /dev/null @@ -1,91 +0,0 @@ -$page-pad: 40px; -$min-width: 320px; -$max-width: 1440px; -$sidebar-width: 320px; -$sidebar-pad: 30px; -$default-border-radius: 4px; - -//html { background-color: $body_bg; } - -//body { color: $body_color; } - -//a { - //color: $link_color; - //&:hover, &:focus { - //color: saturate(darken($link_color, 15), 20); } - //&:visited { - //color: darken(adjust_hue($link_color, 70), 10); } } - -.group { @include pie-clearfix; } - -.inner-wrap { - position: relative; - margin: 0 auto; - padding: 0 $page_pad; - max-width: $max-width; - @extend .group; -} - -.core-layout { > div { @extend .inner-wrap; } } - -body { > header, > nav, > footer { - @extend .core-layout; - min-width: $min-width; - } -} - -#page { - @extend .group; - padding: 0; - max-width: $max-width + $page-pad*2; - margin: 0 auto; - > div { - @extend .group; - //min-width: 480px; - margin-right: $sidebar-width; - > aside { - float: left; - width: $sidebar-width - $sidebar-pad*2; - margin: 0 -100% 0 0; - padding: $sidebar-pad; - } - } -} - -#main { - float: left; - width: 100%; - padding-top: 25px; - padding-bottom: 25px; - > * { - padding-right: $page-pad; - padding-left: $page-pad; - } -} - -@media (min-device-width:1024px) and (max-width:800px), - screen and (max-device-width:480px), (max-device-width:480px) and (orientation:landscape), - (min-device-width:481px) and (max-device-width:1024px) and (orientation:portrait) { - #page > div { margin-right: 0; - #main { float: none; } - > aside { margin: 0; float: none; } - } - page > div > aside { float: none; } - body { > header, > nav, > footer { > div { padding: 0 15px; }}} - #main > * { padding-left: 15px; padding-right: 15px; } -} - -@media only screen and (min-device-width: 320px) and (max-device-width: 480px) { - body { > header, > nav, > footer { > div { padding: 0 10px; }}} - #main > * { padding-left: 10px; padding-right: 10px; } - #page > div { margin: none; > aside { float: none; }} -} - -//*{ - //transition: width .5s; - //-moz-transition: width .5s; - //-webkit-transition: margin .5s; -//} - - -//#search { left: $page-width + $sidebar-margin - $sidebar-width; } diff --git a/source/sass/themes/classic/core/_theme.scss b/source/sass/themes/classic/core/_theme.scss deleted file mode 100644 index a69b11d7..00000000 --- a/source/sass/themes/classic/core/_theme.scss +++ /dev/null @@ -1,45 +0,0 @@ -// Link Colors -$link_color: lighten(#165b94, 0.3); - -// 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; - -$twitter_topic: #888888; diff --git a/source/sass/themes/classic/core/_typography.scss b/source/sass/themes/classic/core/_typography.scss deleted file mode 100644 index 473f0744..00000000 --- a/source/sass/themes/classic/core/_typography.scss +++ /dev/null @@ -1,159 +0,0 @@ -$type-border: #ddd; -$type-color-light: #555; -$type-color: #000; -$blockquote: $type-border !default; //darken($type-border, 20) !default; - - -// 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 { font-family: Adelle, "Helvetica Neue", Helvetica, Arial, sans; } - -body > header h1 { - font-size: 3em; - @extend .heading-font; - 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 { - margin-bottom: 1.5em; - padding-bottom: 1.5em; - padding-top: 1em; - + article { border-top: 3px solid $type-color-light; } - &:last-child { border-bottom: none; } - h2 { - padding-top: 0.8em; - border-top: 3px double $type-border; - } - .author, time { text-transform: uppercase; } - .updated { font-size: .8em; color: $type-color-light; } - 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.2em; - //border: { - top-width: 1px; - //bottom-width: 1px; - //style: dashed; - //color: $type-border; - //} - } - } -} - -#{headings()}{ - @extend .heading-font; 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; } - } -} diff --git a/source/sass/themes/classic/partials/_blog.scss b/source/sass/themes/classic/partials/_blog.scss deleted file mode 100644 index 47b48878..00000000 --- a/source/sass/themes/classic/partials/_blog.scss +++ /dev/null @@ -1,23 +0,0 @@ -article { - h2 { - padding-top: 0; - margin-bottom: 0.1em; } - .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; } } diff --git a/source/sass/themes/classic/partials/_footer.scss b/source/sass/themes/classic/partials/_footer.scss deleted file mode 100644 index 08e6138c..00000000 --- a/source/sass/themes/classic/partials/_footer.scss +++ /dev/null @@ -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; } } } diff --git a/source/sass/themes/classic/partials/_header.scss b/source/sass/themes/classic/partials/_header.scss deleted file mode 100644 index a4964af9..00000000 --- a/source/sass/themes/classic/partials/_header.scss +++ /dev/null @@ -1,11 +0,0 @@ -body > header { - background-color: $header_bg; - border-bottom: 1px solid $header_border; - padding: 25px 0; - h1 { - display: inline-block; - margin: 0; - a, a:visited { - font-weight: normal; - color: $title_color; - text-decoration: none; } } } diff --git a/source/sass/themes/classic/partials/_navigation.scss b/source/sass/themes/classic/partials/_navigation.scss deleted file mode 100644 index 8d8a09d2..00000000 --- a/source/sass/themes/classic/partials/_navigation.scss +++ /dev/null @@ -1,30 +0,0 @@ -#nav { - @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: 6px 0; - li { - padding: 0 15px; - 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; } } } } } diff --git a/source/sass/themes/classic/partials/_page.scss b/source/sass/themes/classic/partials/_page.scss deleted file mode 100644 index 2a1503b4..00000000 --- a/source/sass/themes/classic/partials/_page.scss +++ /dev/null @@ -1,8 +0,0 @@ -body { - background-color: $sidebar_bg; -} - -#page > div { - background-color: $main_bg; border-right: 1px solid $sidebar_border; - @include box-shadow(rgba(#000, .1) 0 0 18px); -} diff --git a/source/sass/themes/classic/partials/_search.scss b/source/sass/themes/classic/partials/_search.scss deleted file mode 100644 index d44c3803..00000000 --- a/source/sass/themes/classic/partials/_search.scss +++ /dev/null @@ -1,19 +0,0 @@ -#search { - position: absolute; - top: 30%; - form { - background: image-url("search_bg.png") no-repeat; - padding: 0; - height: 28px; - width: 218px; } - #q { - background: none; - position: relative; - top: 1px; - width: 160px; - margin-left: 30px; - font-size: 15px; - border: none; - color: #aaaaaa; - &:focus { - outline: none; } } } diff --git a/source/sass/themes/classic/partials/_shared.scss b/source/sass/themes/classic/partials/_shared.scss deleted file mode 100644 index a97b6051..00000000 --- a/source/sass/themes/classic/partials/_shared.scss +++ /dev/null @@ -1,12 +0,0 @@ -#collapser { - display: block; - cursor: pointer; - background: #f8f8f8; - color: #888888; - padding: 5px 10px; - font-size: 10px; - line-height: 150%; - cursor: pointer; - position: absolute; - top: 0; - right: 0; } diff --git a/source/sass/themes/classic/partials/_sidebar.scss b/source/sass/themes/classic/partials/_sidebar.scss deleted file mode 100644 index ebeec9b0..00000000 --- a/source/sass/themes/classic/partials/_sidebar.scss +++ /dev/null @@ -1,38 +0,0 @@ -.subscribe a { - display: inline-block; - padding-left: 28px; - background: image-url("rss.png") left top no-repeat; } -#sidebar { - line-height: 1.45em; - font-size: 90%; - h3 { - margin: 20px -15px 10px; - padding: 12px 15px; - background: white; - border-bottom: 1px solid #e5e5e5; - border-top: 1px solid #e5e5e5; - &:first-child { - margin-top: 0; } } } - -#twitter, #delicious { - @include border-radius; - background: #f8f8f8; - border: 1px solid #eeeeee; - padding: 5px 0; - ul { - list-style-type: none; - margin: 0; } - li { - margin: 0 15px; - padding: 10px 0 0; - border-bottom: #dddddd 1px dashed; - &:last-child { - border-bottom: 0; } } } - -#delicious { - p { - font-style: italic; } - li { - color: #666666; - font-style: normal; - padding-bottom: 8px; } } diff --git a/source/sass/themes/classic/partials/_syntax.scss b/source/sass/themes/classic/partials/_syntax.scss deleted file mode 100644 index b06a5a10..00000000 --- a/source/sass/themes/classic/partials/_syntax.scss +++ /dev/null @@ -1,279 +0,0 @@ -.code_window { - @include border-top-radius(5px); - @include border-bottom-radius(2px); - background: #aaaaaa image-url("code_bg.png") top repeat-x; - position: relative; - margin: 0.3em 0 1.3em; - padding: 0 3px 3px; - font-size: 14px; - border: 1px solid #898989; - border-top-color: #cbcbcb; - border-left-color: #a5a5a5; - border-right-color: #a5a5a5; - em { - text-align: center; - text-shadow: #cccccc 1px 1px 1px; - display: block; - padding: 1px 0; - color: #333333; - font-style: normal; } - .highlight { - margin: 0; } } - -pre { - color: #cccccc; - font-size: 13px; - background: #222222; - line-height: 1.5em; - border: #aaaaaa 1px solid; - overflow-x: auto; - overflow-y: hidden; - padding: 25px 20px; - .lineno { - color: #888888; - background: #e3e3e3; - display: inline-block; - padding: 0 0 0 10px; - &:first-child { - padding-top: 15px; - display: inline-block; } } } - -.highlight { - position: relative; - .pre_expander { - font-size: 10px; - text-align: right; - padding: 4px 8px; - line-height: 150%; - position: absolute; - cursor: pointer; - top: 2px; - right: 2px; - @include border-bottom-left-radius; - display: block; - color: #777777; - background: #333333; - &:hover { - background: #444444; - color: #cccccc; } } } - -// based on: http://github.com/mojombo/tpw/raw/master/css/syntax.css -.editor { - background: rgb(0, 22, 41); - line-height: 1.25; } - -pre.console { - background-color: black; - color: lighten(green, 25); - letter-spacing: 1px; - padding: 0.5em; - .prompt { - color: lighten(navy, 50); - &:before { - color: white; - content: "["; } - &:after { - color: white; - content: "]"; } } - .stdin { - font-weight: bold; - color: lighten(green, 75); } } - -.highlight { - padding: 0 0 0.1em; - color: white; - // Comment - .c { - color: #999988; - font-style: italic; } - // Error - .err { - color: #a61717; - background-color: #e3d2d2; } - // Name - .n { - color: white; } - // Keyword - .k { - color: rgb(255, 157, 0); } - // Paren - .p { - color: darken(#ff9d00, 33); } - // Operator - .o { - color: rgb(255, 157, 0); } - // Comment.Multiline - .cm { - color: #999988; - font-style: italic; } - // Comment.Preproc - .cp { - color: #999999; } - // Comment.Single - .c1 { - color: #999988; - font-style: italic; } - // Comment.Special - .cs { - color: #999999; - font-style: italic; } - // Generic.Deleted - .gd { - color: black; - background-color: #ffdddd; } - // Generic.Deleted.Specific - .gd .x { - color: black; - background-color: #ffaaaa; } - // Generic.Emph - .ge { - font-style: italic; } - // Generic.Error - .gr { - color: #aa0000; } - // Generic.Heading - .gh { - color: #999999; } - // Generic.Inserted - .gi { - color: black; - background-color: #ddffdd; } - // Generic.Inserted.Specific - .gi .x { - color: black; - background-color: #aaffaa; } - // Generic.Output - .go { - color: #888888; } - // Generic.Prompt - .gp { - color: #555555; } - // Generic.Strong - .gs { - color: white; } - // Generic.Subheading - .gu { - color: #aaaaaa; } - // Generic.Traceback - .gt { - color: #aa0000; } - // Keyword.Constant - .kc { - color: white; } - // Keyword.Declaration - .kd { - color: white; } - // Keyword.Pseudo - .kp { - color: white; } - // Keyword.Reserved - .kr { - color: white; } - // Keyword.Type - .kt { - color: #445588; } - // Literal.Number - .m { - color: rgb(255, 98, 140); } - // Literal.String - .s { - color: #dd1144; } - // Name.Attribute - .na { - color: teal; } - // Name.Builtin - .nb { - color: darken(rgb(128, 255, 187), 20); } - // Name.Class - .nc { - color: darken(rgb(128, 255, 187), 20); } - // Name.Constant - .no { - color: rgb(128, 255, 187); } - // Name.Entity - .ni { - color: purple; } - // Name.Exception - .ne { - color: rgb(255, 221, 0); } - // Name.Function - .nf { - color: rgb(255, 221, 0); } - // Name.Namespace - .nn { - color: #555555; } - // Name.Tag - .nt { - color: white; } - // Name.Variable - .nv { - color: teal; } - // Operator.Word - .ow { - color: white; } - // Text.Whitespace - .w { - color: #bbbbbb; } - // Literal.Number - .nl { - color: rgb(255, 98, 140); } - // Literal.Number.Float - .mf { - color: rgb(255, 98, 140); } - // Literal.Number.Hex - .mh { - color: rgb(255, 98, 140); } - // Literal.Number.Integer - .mi { - color: rgb(255, 98, 140); } - // Literal.Number.Oct - .mo { - color: rgb(255, 98, 140); } - // Literal.String.Backtick - .sb { - color: rgb(58, 217, 0); } - // Literal.String.Char - .sc { - color: rgb(58, 217, 0); } - // Literal.String.Doc - .sd { - color: rgb(58, 217, 0); } - // Literal.String.Double - .s2 { - color: rgb(58, 217, 0); } - // Literal.String.Escape - .se { - color: rgb(58, 217, 0); } - // Literal.String.Heredoc - .sh { - color: rgb(58, 217, 0); } - // Literal.String.Interpol - .si { - color: rgb(158, 255, 128); } - // Literal.String.Other - .sx { - color: rgb(58, 217, 0); } - // Literal.String.Regex - .sr { - color: #009926; } - // Literal.String.Single - .s1 { - color: rgb(58, 217, 0); } - // Literal.String.Symbol - .ss { - color: rgb(255, 98, 140); } - // Name.Builtin.Pseudo - .bp { - color: #999999; } - // Name.Variable.Class - .vc { - color: teal; } - // Name.Variable.Global - .vg { - color: teal; } - // Name.Variable.Instance - .vi { - color: teal; } - // Literal.Number.Integer.Long - .il { - color: rgb(255, 98, 140); } } diff --git a/source/sass/themes/classic/partials/_twitter.scss b/source/sass/themes/classic/partials/_twitter.scss deleted file mode 100644 index 5d8b7d97..00000000 --- a/source/sass/themes/classic/partials/_twitter.scss +++ /dev/null @@ -1,15 +0,0 @@ -#twitter { - p { - padding-bottom: 10px; - a.topic { - color: $twitter_topic; } } - .meta { - color: $light_text; - font-size: 80%; - display: block; - padding: 8px 0 0; - a { - color: inherit; - text-decoration: none; - &:hover { - text-decoration: underline; } } } } |