1. Reordered configs in Rakefile based on importance.
2. Refactored stylesheets to simplify dreictory trees.
This commit is contained in:
parent
b9b9eb09c1
commit
a2ab1d4802
11
Rakefile
11
Rakefile
@ -1,6 +1,13 @@
|
|||||||
require "rubygems"
|
require "rubygems"
|
||||||
require "bundler/setup"
|
require "bundler/setup"
|
||||||
|
|
||||||
|
## -- Rsync Deploy config -- ##
|
||||||
|
# Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
|
||||||
|
ssh_user = "mathisweb@imathis.com"
|
||||||
|
document_root = "~/dev.octopress.org/"
|
||||||
|
|
||||||
|
## -- Misc Configs, you probably have no reason to changes these -- ##
|
||||||
|
|
||||||
public_dir = "public" # compiled site directory
|
public_dir = "public" # compiled site directory
|
||||||
source_dir = "source" # source file directory
|
source_dir = "source" # source file directory
|
||||||
deploy_dir = "_deploy" # deploy directory (for Github pages deployment)
|
deploy_dir = "_deploy" # deploy directory (for Github pages deployment)
|
||||||
@ -8,10 +15,6 @@ stash_dir = "_stash" # directory to stash posts for speedy generation
|
|||||||
posts_dir = "_posts" # directory for blog files
|
posts_dir = "_posts" # directory for blog files
|
||||||
post_format = "markdown" # file format for new posts when using the post rake task
|
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 = "mathisweb@imathis.com"
|
|
||||||
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]"
|
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|
|
task :install, :theme do |t, args|
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
@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";
|
|
@ -1,6 +1,6 @@
|
|||||||
$border: inline-image('dotted-border.png');
|
$border: inline-image('dotted-border.png');
|
||||||
#articles {
|
#articles {
|
||||||
@media only screen and (max-width: 992px) {
|
@media only screen and (max-width: 768px) {
|
||||||
ul, ol { margin-left: 1.4em; }
|
ul, ol { margin-left: 1.4em; }
|
||||||
}
|
}
|
||||||
> article {
|
> article {
|
||||||
@ -46,11 +46,15 @@ $border: inline-image('dotted-border.png');
|
|||||||
p.meta { position: static; }
|
p.meta { position: static; }
|
||||||
}
|
}
|
||||||
|
|
||||||
&.feature h1 {
|
}
|
||||||
|
h1.feature {
|
||||||
|
padding-top: .5em;
|
||||||
|
margin-bottom: 1em;
|
||||||
|
padding-bottom: 1em;
|
||||||
|
background: $border bottom left repeat-x;
|
||||||
font-size: 2.0em; font-style: italic;
|
font-size: 2.0em; font-style: italic;
|
||||||
line-height: 1.3em;
|
line-height: 1.3em;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
.entry-content {
|
.entry-content {
|
||||||
img, video { max-width: 100%; height: auto; }
|
img, video { max-width: 100%; height: auto; }
|
||||||
video { display: block; margin-bottom: 1.5em;
|
video { display: block; margin-bottom: 1.5em;
|
@ -75,7 +75,7 @@ body > nav {
|
|||||||
float: right;
|
float: right;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding-left: .8em;
|
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 {
|
.search {
|
||||||
width: 93%;
|
width: 93%;
|
||||||
font-size: .95em;
|
font-size: .95em;
|
||||||
@ -92,7 +92,7 @@ body > nav {
|
|||||||
|
|
||||||
@media only screen and (min-width: 992px) {
|
@media only screen and (min-width: 992px) {
|
||||||
form {
|
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 {
|
ul[data-subscription$=email] + form {
|
||||||
width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 - 58px;
|
width: $sidebar-width-wide - $pad-wide - $sidebar-pad-wide*2 - 58px;
|
@ -1,2 +1,20 @@
|
|||||||
@import "compass";
|
@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";
|
||||||
|
Loading…
Reference in New Issue
Block a user