aboutsummaryrefslogtreecommitdiff
path: root/source/sass
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-05-15 18:33:00 -0400
committerBrandon Mathis <brandon@imathis.com>2011-05-15 18:33:00 -0400
commitc7d5365f81552cae16bbb91696ca3e67b4a0a2e9 (patch)
tree76c57e41828a3492535cde7fe82bef98ccea0eb4 /source/sass
parente4c2d5790bac6a74037638fde049c374fc44cc7b (diff)
downloadmy_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 '')
-rw-r--r--sass/screen.scss (renamed from source/sass/screen.scss)2
-rw-r--r--sass/themes/classic/_partials.scss (renamed from source/sass/themes/classic/_partials.scss)10
-rw-r--r--sass/themes/classic/_style.scss (renamed from source/sass/themes/classic/_style.scss)4
-rw-r--r--sass/themes/classic/core/_theme.scss (renamed from source/sass/themes/classic/core/_theme.scss)0
-rw-r--r--sass/themes/classic/core/_typography.scss (renamed from source/sass/themes/classic/core/_typography.scss)21
-rw-r--r--sass/themes/classic/partials/_blog.scss (renamed from source/sass/themes/classic/partials/_blog.scss)3
-rw-r--r--sass/themes/classic/partials/_footer.scss (renamed from source/sass/themes/classic/partials/_footer.scss)0
-rw-r--r--sass/themes/classic/partials/_header.scss (renamed from source/sass/themes/classic/partials/_header.scss)6
-rw-r--r--sass/themes/classic/partials/_page.scss (renamed from source/sass/themes/classic/partials/_page.scss)4
-rw-r--r--sass/themes/classic/partials/_shared.scss (renamed from source/sass/themes/classic/partials/_shared.scss)0
-rw-r--r--sass/themes/classic/partials/_syntax.scss (renamed from source/sass/themes/classic/partials/_syntax.scss)0
-rw-r--r--sass/themes/classic/partials/_twitter.scss (renamed from source/sass/themes/classic/partials/_twitter.scss)0
-rw-r--r--source/sass/themes/classic/core/_layout.scss91
-rw-r--r--source/sass/themes/classic/partials/_navigation.scss30
-rw-r--r--source/sass/themes/classic/partials/_search.scss19
-rw-r--r--source/sass/themes/classic/partials/_sidebar.scss38
16 files changed, 22 insertions, 206 deletions
diff --git a/source/sass/screen.scss b/sass/screen.scss
index 4edf7422..c090c3b5 100644
--- a/source/sass/screen.scss
+++ b/sass/screen.scss
@@ -1,5 +1,5 @@
@import "compass";
-@import "compass/layout";
+
@include global-reset;
diff --git a/source/sass/themes/classic/_partials.scss b/sass/themes/classic/_partials.scss
index c88faaac..e1e72490 100644
--- a/source/sass/themes/classic/_partials.scss
+++ b/sass/themes/classic/_partials.scss
@@ -1,8 +1,8 @@
-@import "partials/shared";
-@import "partials/syntax";
-@import "partials/search";
-@import "partials/sidebar";
-@import "partials/twitter";
+//@import "partials/shared";
+//@import "partials/syntax";
+//@import "partials/search";
+//@import "partials/sidebar";
+//@import "partials/twitter";
/* layout partials */
@import "partials/header";
diff --git a/source/sass/themes/classic/_style.scss b/sass/themes/classic/_style.scss
index f36aaa18..70421360 100644
--- a/source/sass/themes/classic/_style.scss
+++ b/sass/themes/classic/_style.scss
@@ -1,4 +1,4 @@
-@import "core/layout";
@import "core/theme";
+@import "core/layout";
@import "core/typography";
-//@import "partials";
+@import "partials";
diff --git a/source/sass/themes/classic/core/_theme.scss b/sass/themes/classic/core/_theme.scss
index a69b11d7..a69b11d7 100644
--- a/source/sass/themes/classic/core/_theme.scss
+++ b/sass/themes/classic/core/_theme.scss
diff --git a/source/sass/themes/classic/core/_typography.scss b/sass/themes/classic/core/_typography.scss
index 473f0744..5916c82e 100644
--- a/source/sass/themes/classic/core/_typography.scss
+++ b/sass/themes/classic/core/_typography.scss
@@ -7,6 +7,7 @@ $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; }
+.sans-font { font-family: "Helvetica Neue", Helvetica, Arial, sans; }
body > header h1 {
font-size: 3em;
@@ -24,17 +25,17 @@ body {
}
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; }
+ .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;
@@ -47,13 +48,7 @@ article {
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;
- //}
+ margin-top: -1.4em;
}
}
}
diff --git a/source/sass/themes/classic/partials/_blog.scss b/sass/themes/classic/partials/_blog.scss
index 47b48878..1dd255dd 100644
--- a/source/sass/themes/classic/partials/_blog.scss
+++ b/sass/themes/classic/partials/_blog.scss
@@ -1,7 +1,4 @@
article {
- h2 {
- padding-top: 0;
- margin-bottom: 0.1em; }
.title {
text-decoration: none;
&:hover {
diff --git a/source/sass/themes/classic/partials/_footer.scss b/sass/themes/classic/partials/_footer.scss
index 08e6138c..08e6138c 100644
--- a/source/sass/themes/classic/partials/_footer.scss
+++ b/sass/themes/classic/partials/_footer.scss
diff --git a/source/sass/themes/classic/partials/_header.scss b/sass/themes/classic/partials/_header.scss
index a4964af9..ba7993a8 100644
--- a/source/sass/themes/classic/partials/_header.scss
+++ b/sass/themes/classic/partials/_header.scss
@@ -1,11 +1,13 @@
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; } } }
+ text-decoration: none;
+ }
+ }
+}
diff --git a/source/sass/themes/classic/partials/_page.scss b/sass/themes/classic/partials/_page.scss
index 2a1503b4..414a37e9 100644
--- a/source/sass/themes/classic/partials/_page.scss
+++ b/sass/themes/classic/partials/_page.scss
@@ -2,7 +2,7 @@ body {
background-color: $sidebar_bg;
}
-#page > div {
+body > div > div {
background-color: $main_bg; border-right: 1px solid $sidebar_border;
- @include box-shadow(rgba(#000, .1) 0 0 18px);
+ //@include box-shadow(rgba(#000, .1) 0 0 18px);
}
diff --git a/source/sass/themes/classic/partials/_shared.scss b/sass/themes/classic/partials/_shared.scss
index a97b6051..a97b6051 100644
--- a/source/sass/themes/classic/partials/_shared.scss
+++ b/sass/themes/classic/partials/_shared.scss
diff --git a/source/sass/themes/classic/partials/_syntax.scss b/sass/themes/classic/partials/_syntax.scss
index b06a5a10..b06a5a10 100644
--- a/source/sass/themes/classic/partials/_syntax.scss
+++ b/sass/themes/classic/partials/_syntax.scss
diff --git a/source/sass/themes/classic/partials/_twitter.scss b/sass/themes/classic/partials/_twitter.scss
index 5d8b7d97..5d8b7d97 100644
--- a/source/sass/themes/classic/partials/_twitter.scss
+++ b/sass/themes/classic/partials/_twitter.scss
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/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/_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/_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; } }