Browse Source

1. Reordered configs in Rakefile based on importance.

2. Refactored stylesheets to simplify dreictory trees.
unreleased_contents
Brandon Mathis 14 years ago
parent
commit
a2ab1d4802
  1. 11
      Rakefile
  2. 0
      themes/classic/sass/core/_layout.scss
  3. 0
      themes/classic/sass/core/_theme.scss
  4. 0
      themes/classic/sass/core/_typography.scss
  5. 0
      themes/classic/sass/core/_utilities.scss
  6. 0
      themes/classic/sass/custom/_colors.scss
  7. 0
      themes/classic/sass/custom/_styles.scss
  8. 19
      themes/classic/sass/default/_style.scss
  9. 14
      themes/classic/sass/partials/_blog.scss
  10. 0
      themes/classic/sass/partials/_delicious.scss
  11. 0
      themes/classic/sass/partials/_footer.scss
  12. 0
      themes/classic/sass/partials/_header.scss
  13. 4
      themes/classic/sass/partials/_navigation.scss
  14. 0
      themes/classic/sass/partials/_page.scss
  15. 0
      themes/classic/sass/partials/_pinboard.scss
  16. 0
      themes/classic/sass/partials/_sidebar.scss
  17. 0
      themes/classic/sass/partials/_solarized.scss
  18. 0
      themes/classic/sass/partials/_syntax.scss
  19. 0
      themes/classic/sass/partials/_twitter.scss
  20. 20
      themes/classic/sass/screen.scss

11
Rakefile

@ -1,6 +1,13 @@
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 = "mathisweb@imathis.com"
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)
@ -8,10 +15,6 @@ 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 = "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]"
task :install, :theme do |t, args|

0
themes/classic/sass/default/core/_layout.scss → themes/classic/sass/core/_layout.scss

0
themes/classic/sass/default/core/_theme.scss → themes/classic/sass/core/_theme.scss

0
themes/classic/sass/default/core/_typography.scss → themes/classic/sass/core/_typography.scss

0
themes/classic/sass/default/core/_utilities.scss → themes/classic/sass/core/_utilities.scss

0
themes/classic/sass/default/custom/_colors.scss → themes/classic/sass/custom/_colors.scss

0
themes/classic/sass/default/custom/_styles.scss → themes/classic/sass/custom/_styles.scss

19
themes/classic/sass/default/_style.scss

@ -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";

14
themes/classic/sass/default/partials/_blog.scss → themes/classic/sass/partials/_blog.scss

@ -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 {
@ -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; }

0
themes/classic/sass/default/partials/_delicious.scss → themes/classic/sass/partials/_delicious.scss

0
themes/classic/sass/default/partials/_footer.scss → themes/classic/sass/partials/_footer.scss

0
themes/classic/sass/default/partials/_header.scss → themes/classic/sass/partials/_header.scss

4
themes/classic/sass/default/partials/_navigation.scss → themes/classic/sass/partials/_navigation.scss

@ -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;
@ -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;

0
themes/classic/sass/default/partials/_page.scss → themes/classic/sass/partials/_page.scss

0
themes/classic/sass/default/partials/_pinboard.scss → themes/classic/sass/partials/_pinboard.scss

0
themes/classic/sass/default/partials/_sidebar.scss → themes/classic/sass/partials/_sidebar.scss

0
themes/classic/sass/default/partials/_solarized.scss → themes/classic/sass/partials/_solarized.scss

0
themes/classic/sass/default/partials/_syntax.scss → themes/classic/sass/partials/_syntax.scss

0
themes/classic/sass/default/partials/_twitter.scss → themes/classic/sass/partials/_twitter.scss

20
themes/classic/sass/screen.scss

@ -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";

Loading…
Cancel
Save