Permalink
Browse files

Merge branch 'master' of github.com:JumpstartLab/curriculum

  • Loading branch information...
2 parents 6c3dfbe + b12e58e commit 3c03a01c54a2f5e64ad23fc8bb18ddd4ca70eb12 @jcasimir jcasimir committed Nov 15, 2012
Showing with 2,406 additions and 998 deletions.
  1. +1 −1 .gitignore
  2. +5 −0 .powrc
  3. +1 −1 .rbenv-version
  4. +1 −1 .rvmrc
  5. +0 −1 .slugignore
  6. +41 −13 .themes/classic/sass/base/_layout.scss
  7. +21 −9 .themes/classic/sass/base/_solarized.scss
  8. +6 −2 .themes/classic/sass/base/_theme.scss
  9. +26 −9 .themes/classic/sass/base/_typography.scss
  10. +7 −2 .themes/classic/sass/custom/_colors.scss
  11. +10 −0 .themes/classic/sass/custom/_fonts.scss
  12. +4 −0 .themes/classic/sass/custom/_layout.scss
  13. +6 −7 .themes/classic/sass/partials/_blog.scss
  14. +1 −1 .themes/classic/sass/partials/_footer.scss
  15. +4 −3 .themes/classic/sass/partials/_navigation.scss
  16. +2 −0 .themes/classic/sass/partials/_sharing.scss
  17. +1 −0 .themes/classic/sass/partials/_sidebar.scss
  18. +26 −18 .themes/classic/sass/partials/_syntax.scss
  19. +1 −0 .themes/classic/sass/partials/sidebar/_base.scss
  20. +26 −0 .themes/classic/sass/partials/sidebar/_googleplus.scss
  21. +1 −1 .themes/classic/sass/partials/sidebar/_twitter.scss
  22. +1 −0 .themes/classic/sass/screen.scss
  23. +5 −0 .themes/classic/source/_includes/after_footer.html
  24. +3 −3 .themes/classic/source/_includes/article.html
  25. +3 −2 .themes/classic/source/_includes/asides/delicious.html
  26. +2 −2 .themes/classic/source/_includes/asides/github.html
  27. +11 −0 .themes/classic/source/_includes/asides/googleplus.html
  28. +1 −1 .themes/classic/source/_includes/asides/twitter.html
  29. +3 −0 .themes/classic/source/_includes/custom/after_footer.html
  30. +27 −0 .themes/classic/source/_includes/custom/category_feed.xml
  31. +3 −4 .themes/classic/source/_includes/disqus.html
  32. +10 −0 .themes/classic/source/_includes/facebook_like.html
  33. +3 −2 .themes/classic/source/_includes/head.html
  34. +2 −0 .themes/classic/source/_includes/navigation.html
  35. +6 −3 .themes/classic/source/_includes/post/date.html
  36. +3 −0 .themes/classic/source/_includes/post/sharing.html
  37. +2 −5 .themes/classic/source/_layouts/default.html
  38. +1 −1 .themes/classic/source/_layouts/page.html
  39. +8 −0 .themes/classic/source/_layouts/post.html
  40. +114 −114 .themes/classic/source/assets/jwplayer/glow/glow.xml
  41. +6 −7 .themes/classic/source/atom.xml
  42. +9 −11 .themes/classic/source/index.html
  43. +44 −1 .themes/classic/source/javascripts/ender.js
  44. +32 −38 .themes/classic/source/javascripts/github.js
  45. +31 −15 .themes/classic/source/javascripts/octopress.js
  46. +2 −2 .themes/classic/source/javascripts/pinboard.js
  47. +61 −65 .themes/classic/source/javascripts/twitter.js
  48. +4 −0 .travis.yml
  49. +14 −13 Gemfile
  50. +25 −34 Gemfile.lock
  51. +1 −1 Procfile
  52. +2 −0 README.markdown
  53. +55 −26 Rakefile
  54. +20 −2 _config.yml
  55. +108 −0 plugins/alias_generator.rb
  56. +24 −30 plugins/backtick_code_block.rb
  57. +4 −4 plugins/blockquote.rb
  58. +36 −0 plugins/category_generator.rb
  59. +2 −1 plugins/code_block.rb
  60. +0 −1 plugins/compass_compiler.rb
  61. +98 −0 plugins/date.rb
  62. +7 −1 plugins/gist_tag.rb
  63. +23 −22 plugins/image_tag.rb
  64. +40 −0 plugins/jsfiddle.rb
  65. +41 −29 plugins/octopress_filters.rb
  66. +48 −0 plugins/preview_unpublished.rb
  67. +10 −5 plugins/pullquote.rb
  68. +6 −2 plugins/pygments_code.rb
  69. +489 −0 plugins/rubypants.rb
  70. +2 −2 plugins/titlecase.rb
  71. +1 −0 sass/custom/_paper_style.scss
  72. +3 −3 server.rb
  73. +2 −2 source/assets/jsblogger/screen.css
  74. +70 −67 source/projects/blogger.markdown
  75. +533 −253 source/projects/encryptor.markdown
  76. +15 −28 source/projects/eventmanager.markdown
  77. +56 −58 source/projects/jscontact.textile
  78. +38 −38 source/projects/jsmerchant.textile
  79. +31 −18 source/projects/ruby_in_100_minutes.markdown
  80. +6 −6 source/projects/sales_engine.markdown
  81. +2 −2 source/projects/store_engine.markdown
  82. +1 −1 source/topics/debugging/debugger.markdown
  83. +2 −1 source/topics/environment/environment.markdown
  84. +3 −3 source/topics/systems/automation.markdown
View
@@ -14,4 +14,4 @@ source/stylesheets/*.css
source/stylesheets/**/*.css
vendor
pdf
-public
+public
View
5 .powrc
@@ -0,0 +1,5 @@
+if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ] ; then
+ source "$rvm_path/scripts/rvm"
+ source ".rvmrc"
+fi
+
View
@@ -1 +1 @@
-1.9.2-p290
+1.9.3-p194
View
2 .rvmrc
@@ -1 +1 @@
-rvm 1.9.3
+rvm use 1.9.3
View
@@ -1 +0,0 @@
-
@@ -14,6 +14,10 @@ $sidebar-width-wide: 300px !default;
$indented-lists: false !default;
+$header-font-size: 1em !default;
+$header-padding-top: 1.5em !default;
+$header-padding-bottom: 1.5em !default;
+
.group { @include pie-clearfix; }
@mixin collapse-sidebar {
@@ -32,7 +36,10 @@ $indented-lists: false !default;
&.thirds section {
width: 30%;
margin-left: 5%;
- &.first { margin-left: 0; }
+ &.first {
+ margin-left: 0;
+ clear: both;
+ }
}
}
@@ -41,7 +48,7 @@ body {
max-width: $max-width;
position: relative;
margin: 0 auto;
- > header, > nav, > footer, #content > article, #content > div > article, #content > div > section, nav.pagination {
+ > header, > nav, > footer, #content > article, #content > div > article, #content > div > section {
@extend .group;
padding-left: $pad-min;
padding-right: $pad-min;
@@ -58,14 +65,34 @@ body {
padding-right: $pad-wide;
}
}
+ div.pagination {
+ @extend .group;
+ margin-left: $pad-min;
+ margin-right: $pad-min;
+ @media only screen and (min-width: 480px) {
+ margin-left: $pad-narrow;
+ margin-right: $pad-narrow;
+ }
+ @media only screen and (min-width: 768px) {
+ margin-left: $pad-medium;
+ margin-right: $pad-medium;
+ }
+ @media only screen and (min-width: 992px) {
+ margin-left: $pad-wide;
+ margin-right: $pad-wide;
+ }
+ }
> header {
- font-size: 1em;
- padding-top: 1.5em;
- padding-bottom: 1.5em;
+ font-size: $header-font-size;
+ padding-top: $header-padding-top;
+ padding-bottom: $header-padding-bottom;
}
}
-#content { > div, > article { width: 100%; }}
+#content {
+ overflow: hidden;
+ > div, > article { width: 100%; }
+}
aside.sidebar {
float: none;
@@ -95,21 +122,23 @@ body.sidebar-footer {
}
@media only screen and (min-width: 550px) {
- body > header { font-size: 1em; }
+ body > header { font-size: $header-font-size; }
}
@media only screen and (min-width: 750px) {
aside.sidebar { @include collapse-sidebar; }
}
+#main, #content, .sidebar {
+ @extend .group;
+}
@media only screen and (min-width: 768px) {
body { -webkit-text-size-adjust: auto; }
- body > header { font-size: 1.2em; }
+ body > header { font-size: $header-font-size * 1.2; }
#main {
- @extend .group;
padding: 0;
margin: 0 auto;
}
#content {
- @extend .group;
+ overflow: visible;
margin-right: $sidebar-width-medium;
position: relative;
.no-sidebar & { margin-right: 0; border-right: 0; }
@@ -121,7 +150,6 @@ body.sidebar-footer {
}
}
aside.sidebar {
- @extend .group;
width: $sidebar-width-medium - $sidebar-pad-medium*2;
padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
background: none;
@@ -139,7 +167,7 @@ body.sidebar-footer {
}
@media only screen and (min-width: 992px) {
- body > header { font-size: 1.3em; }
+ body > header { font-size: $header-font-size * 1.3; }
#content { margin-right: $sidebar-width-wide; }
#content {
> div, > article {
@@ -152,7 +180,6 @@ body.sidebar-footer {
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
.collapse-sidebar & {
padding: { left: $pad-wide; right: $pad-wide; }
- @extend .group;
}
}
}
@@ -162,3 +189,4 @@ body.sidebar-footer {
ul, ol { margin-left: 0; }
}
}
+
@@ -18,17 +18,29 @@ $solar-green: #859900 !default;
$solarized: dark !default;
@if $solarized == light {
- $base03: #fdf6e3;
- $base02: #eee8d5;
- $base01: #93a1a1;
- $base00: #839496;
- $base0: #657b83;
- $base1: #586e75;
- $base2: #073642;
- $base3: #002b36;
+
+ $_base03: $base03;
+ $_base02: $base02;
+ $_base01: $base01;
+ $_base00: $base00;
+ $_base0: $base0;
+ $_base1: $base1;
+ $_base2: $base2;
+ $_base3: $base3;
+
+ $base03: $_base3;
+ $base02: $_base2;
+ $base01: $_base1;
+ $base00: $_base0;
+ $base0: $_base00;
+ $base1: $_base01;
+ $base2: $_base02;
+ $base3: $_base03;
}
/* non highlighted code colors */
$pre-bg: $base03 !default;
-$pre-border: $base02 !default;
+$pre-border: darken($base02, 5) !default;
$pre-color: $base1 !default;
+
+
@@ -1,4 +1,4 @@
-$noise-bg: image-url('noise.png') top left;
+$noise-bg: image-url('noise.png') top left !default;
$img-border: inline-image('dotted-border.png');
// Main Link Colors
@@ -23,6 +23,8 @@ $type-border: #ddd !default;
/* Navigation */
$nav-bg: #ccc !default;
+$nav-bg-front: image-url('noise.png') !default;
+$nav-bg-back: linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11)) !default;
$nav-color: darken($nav-bg, 38) !default;
$nav-color-hover: darken($nav-color, 25) !default;
$nav-placeholder: desaturate(darken($nav-bg, 10), 15) !default;
@@ -39,13 +41,15 @@ $sidebar-link-color-hover: $link-color-hover !default;
$sidebar-link-color-active: $link-color-active !default;
$sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
$sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
-$sidebar-border: darken($sidebar-bg, 7) !default;
+$sidebar-border-hover: darken($sidebar-bg, 7) !default;
$sidebar-link-color-subdued: lighten($sidebar-color, 20) !default;
$sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default;
$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;
$footer-color: #888 !default;
$footer-bg: #ccc !default;
+$footer-bg-front: image-url('noise.png') !default;
+$footer-bg-back: linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)) !default;
$footer-color: darken($footer-bg, 38) !default;
$footer-color-hover: darken($footer-color, 10) !default;
$footer-border-top: lighten($footer-bg, 15) !default;
@@ -1,21 +1,30 @@
$blockquote: $type-border !default;
-$mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
+$sans: "PT Sans", "Helvetica Neue", Arial, sans-serif !default;
+$serif: "PT Serif", Georgia, Times, "Times New Roman", serif !default;
+$mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace !default;
+$heading-font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif !default;
+$header-title-font-family: $heading-font-family !default;
+$header-subtitle-font-family: $heading-font-family !default;
// Fonts
.heading {
- font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif;
+ font-family: $heading-font-family;
}
-.sans { font-family: "PT Sans", "Helvetica Neue", Arial, sans-serif; }
-.serif { font-family: "PT Serif", Georgia, Times, "Times New Roman", serif; }
+.sans { font-family: $sans; }
+.serif { font-family: $serif; }
.mono { font-family: $mono; }
body > header h1 {
font-size: 2.2em;
@extend .heading;
+ font-family: $header-title-font-family;
font-weight: normal;
line-height: 1.2em;
margin-bottom: 0.6667em;
}
+body > header h2 {
+ font-family: $header-subtitle-font-family;
+}
body {
line-height: 1.5em;
@@ -56,12 +65,12 @@ h6, section h5, section section h4, section section section h3 {
p, blockquote, ul, ol { margin-bottom: 1.5em; }
ul { list-style-type: disc;
- ul { list-style-type: circle;
- ul { list-style-type: square; }}}
+ ul { list-style-type: circle; margin-bottom: 0px;
+ ul { list-style-type: square; margin-bottom: 0px; }}}
ol { list-style-type: decimal;
- ol { list-style-type: lower-alpha;
- ol { list-style-type: lower-roman; }}}
+ ol { list-style-type: lower-alpha; margin-bottom: 0px;
+ ol { list-style-type: lower-roman; margin-bottom: 0px; }}}
ul, ol { &, ul, ol { margin-left: 1.3em; }}
@@ -115,7 +124,8 @@ blockquote {
}
}
-.has-pullquote:before {
+.pullquote-right:before,
+.pullquote-left:before {
/* Reset metrics. */
padding: 0;
border: none;
@@ -134,6 +144,13 @@ blockquote {
font-size: 1.4em;
line-height: 1.45em;
}
+
+.pullquote-left:before {
+ /* Make left pullquotes align properly. */
+ float: left;
+ margin: .5em 1.5em 1em 0;
+}
+
/* @extend this to force long lines of continuous text to wrap */
.force-wrap {
white-space: -moz-pre-wrap;
@@ -5,13 +5,18 @@
//$header-bg: #263347;
//$subtitle-color: lighten($header-bg, 58);
//$nav-bg: desaturate(lighten(#8fc17a, 18), 5);
+//$nav-bg-front: image-url('noise.png');
+//$nav-bg-back: linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11));
//$sidebar-bg: desaturate(#eceff5, 8);
//$sidebar-link-color: saturate(#526f9a, 10);
//$sidebar-link-color-hover: darken(#7ab662, 9);
+//$footer-bg: #ccc !default;
+//$footer-bg-front: image-url('noise.png');
+//$footer-bg-back: linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11));
/* To use the light Solarized highlighting theme uncomment the following line */
-//$solarized: light
+//$solarized: light;
/* If you want to tweak the Solarized colors you can do that here */
//$base03: #002b36; //darkest blue
@@ -34,5 +39,5 @@
/* Non highlighted code colors */
//$pre-bg: $base03;
-//$pre-border: $base02;
+//$pre-border: darken($base02, 5);
//$pre-color: $base1;
@@ -0,0 +1,10 @@
+// Here you can easily change font faces which are used in your site.
+// To give it a try, uncomment some of the lines below rebuild your blog, and see how it works. your sites's.
+// If you love to use Web Fonts, you also need to add some lines to source/_includes/custom/head.html
+
+//$sans: "Optima", sans-serif;
+//$serif: "Baskerville", serif;
+//$mono: "Courier", monospace;
+//$heading-font-family: "Verdana", sans-serif;
+//$header-title-font-family: "Futura", sans-serif;
+//$header-subtitle-font-family: "Futura", sans-serif;
@@ -1,6 +1,10 @@
// Here you can easily change your sites's layout.
// To give it a try, uncomment some of the lines below, make changes, rebuild your blog, and see how it works.
+//$header-font-size: 1em;
+//$header-padding-top: 1.5em;
+//$header-padding-bottom: 1.5em;
+
//$max-width: 1350px;
//$indented-lists: true;
@@ -1,5 +1,4 @@
article {
- overflow: hidden;
padding-top: 1em;
a { @extend .force-wrap; }
header {
@@ -74,6 +73,8 @@ article {
p.meta {
margin-bottom: .8em;
font-size: .85em;
+ clear: both;
+ overflow: hidden;
}
.byline + time:before, time +time:before, .comments:before, .byline ~ .categories:before {
@extend .separator;
@@ -121,14 +122,12 @@ article + article {
display: inline-block;
}
-#content nav.pagination {
+#content div.pagination {
text-align: center;
font-size: .95em;
- div {
- position: relative;
- background: $img-border top left repeat-x;
- padding: {top: 1.5em; bottom: 1.5em;}
- }
+ position: relative;
+ background: $img-border top left repeat-x;
+ padding: {top: 1.5em; bottom: 1.5em;}
a {
text-decoration: none;
color: $text-color-light;
@@ -4,7 +4,7 @@ body > footer {
color: $footer-color;
text-shadow: lighten($footer-bg, 5) 0 1px;
background-color: $footer-bg;
- @include background(image-url('noise.png'), linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)));
+ @include background($footer-bg-front, $footer-bg-back);
border-top: 1px solid $footer-border-top;
position: relative;
padding-top: 1em;
Oops, something went wrong.

0 comments on commit 3c03a01

Please sign in to comment.