Skip to content

Commit

Permalink
1. Reordered configs in Rakefile based on importance.
Browse files Browse the repository at this point in the history
2. Refactored stylesheets to simplify dreictory trees.
  • Loading branch information
imathis committed Jun 22, 2011
1 parent b9b9eb0 commit a2ab1d4
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 31 deletions.
11 changes: 7 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
require "rubygems"
require "bundler/setup"

## -- Rsync Deploy config -- ##
# Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
ssh_user = "[email protected]"
document_root = "~/dev.octopress.org/"

## -- Misc Configs, you probably have no reason to changes these -- ##

public_dir = "public" # compiled site directory
source_dir = "source" # source file directory
deploy_dir = "_deploy" # deploy directory (for Github pages deployment)
stash_dir = "_stash" # directory to stash posts for speedy generation
posts_dir = "_posts" # directory for blog files
post_format = "markdown" # file format for new posts when using the post rake task

## -- Rsync Deploy config -- ##
# Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
ssh_user = "[email protected]"
document_root = "~/dev.octopress.org/"

desc "Initial setup for Octopress: copies the default theme into the path of Jekyll's generator. rake install defaults to rake install[classic] to install a different theme run rake install[some_theme_name]"
task :install, :theme do |t, args|
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 0 additions & 19 deletions themes/classic/sass/default/_style.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$border: inline-image('dotted-border.png');
#articles {
@media only screen and (max-width: 992px) {
@media only screen and (max-width: 768px) {
ul, ol { margin-left: 1.4em; }
}
> article {
Expand Down Expand Up @@ -46,10 +46,14 @@ $border: inline-image('dotted-border.png');
p.meta { position: static; }
}

&.feature h1 {
font-size: 2.0em; font-style: italic;
line-height: 1.3em;
}
}
h1.feature {
padding-top: .5em;
margin-bottom: 1em;
padding-bottom: 1em;
background: $border bottom left repeat-x;
font-size: 2.0em; font-style: italic;
line-height: 1.3em;
}
.entry-content {
img, video { max-width: 100%; height: auto; }
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ body > nav {
float: right;
text-align: left;
padding-left: .8em;
width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium + 5px;
width: $sidebar-width-medium - $pad-medium*2 - $sidebar-pad-medium + 20px;
.search {
width: 93%;
font-size: .95em;
Expand All @@ -92,7 +92,7 @@ body > nav {

@media only screen and (min-width: 992px) {
form {
width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 + 5px;
width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 + 10px;
}
ul[data-subscription$=email] + form {
width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 - 58px;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 19 additions & 1 deletion themes/classic/sass/screen.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,20 @@
@import "compass";
@import "default/style";
@include global-reset;
@include reset-html5;

@import "core/utilities";
@import "partials/solarized";
@import "custom/colors";
@import "core/theme";
@import "core/layout";
@import "core/typography";

/* layout partials */
@import "partials/header";
@import "partials/navigation";
@import "partials/page";
@import "partials/sidebar";
@import "partials/blog";
@import "partials/footer";
@import "partials/syntax";
@import "custom/styles";

0 comments on commit a2ab1d4

Please sign in to comment.