caboodle 0.2.1 → 0.2.2

data/lib/caboodle/kits/posterous/views/posts.haml

@@ -5,8 +5,20 @@
   - else
     - @posts.each do |post|
       = haml :_post, :layout=>false, :locals=>{:post=>post}
-    #pagination
-      Pagination here
+    %nav#pagination
+      - page = params[:page].to_i if defined?(params[:page])
+      - page ||= 1
+      - page = 1 if page < 1
+      #next
+        - if page > 1
+          %a{:href=>"/posterous/#{page-1}"}
+            Next
+      
+      #previous
+        - if @posts
+          %a{:href=>"/posterous/#{page+1}"}
+            Previous
+      
     - if Caboodle::Site.disqus
       :javascript
         (function() {

data/lib/caboodle/kits/soundcloud/soundcloud.rb

@@ -8,6 +8,8 @@ module Caboodle
     end
 
     required [:soundcloud_query]
+    
+    credit "http://soundcloud.com"
   end
 
   class SoundcloudAPI < Weary::Base

data/lib/caboodle/kits/susy/susy.rb

@@ -0,0 +1,47 @@
+gem "sinatra-compass"
+require "sinatra/compass"
+
+gem "compass-susy-plugin"
+require "susy"
+
+require "compass"
+require "sinatra/base"
+require "sinatra/sugar"
+require "sinatra/advanced_routes"
+
+module Caboodle
+  class Susy < Caboodle::Kit
+            
+    get("/susy/:name.css") do
+      puts "*** root"
+      puts Caboodle::App.root
+      content_type 'text/css', :charset => 'utf-8'
+      sass_dir = File.expand_path(File.join(File.dirname(__FILE__),"views","susy"))
+      #puts sass_dir
+      load_paths = [Caboodle::App.root, File.join(Caboodle::App.root,"views"), File.join(Caboodle::App.root,"views","stylesheets"), sass_dir] + ::Compass.sass_engine_options[:load_paths]
+      #puts load_paths.inspect
+      Caboodle::Kits.each do |name|
+        kit_name = name.to_s.split("::").last || name
+        kit_name = kit_name.downcase
+        load_paths << File.expand_path(File.join(File.dirname(__FILE__),"..",kit_name,"views"))
+      end
+      
+      options = {:sass_dir => sass_dir, :syntax => :scss, :load_paths => load_paths}
+      the_sass = open(File.join(File.dirname(__FILE__),"views","susy","screen.scss")).read
+      Caboodle::SASS.each do |s|
+        the_sass << "\n"
+        add_file = "@import \"#{s}\";"
+        puts add_file
+        the_sass << add_file
+      end
+      
+      opts = options.merge!(::Compass.sass_engine_options)
+      opts[:load_paths] = load_paths
+      puts opts.inspect
+      sass the_sass, opts
+    end
+
+    stylesheets ["/susy/screen.css"]
+
+  end
+end

data/lib/caboodle/kits/susy/views/susy/_base.scss

@@ -0,0 +1,49 @@
+//**
+//  Susy: Un-obtrusive grids for designers
+//  By: Eric A. Meyer and OddBird
+//  Site: www.oddbird.net/susy/
+//**
+
+// Font Sizes --------------------------------------------------------------
+
+$base-font-size: 16px;
+$base-line-height: 24px;
+
+// Grid --------------------------------------------------------------
+
+$total-cols: 12;
+$col-width: 4em;
+$gutter-width: 1em;
+$side-gutter-width: $gutter-width;
+
+// Don't move this @import above the GRID and FONT-SIZE variables.
+@import "susy/susy";
+
+// Colors --------------------------------------------------------------
+
+$base: #4c4c4c;
+$alt: #ff6600;
+
+// Fonts --------------------------------------------------------------
+
+@mixin sans-family {
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-weight: lighter;
+}
+
+@mixin serif-family {
+  font-family: 'Adobe Caslon Pro', Caslon, Baskerville, Palatino, 'Palatino Linotype', "Hoefler Text", Garamond, "URW Palladio L", "Book Antiqua", Georgia, serif;
+}
+
+@mixin monospace-family {
+  font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif;
+}
+
+@mixin slab-family {
+  font-family: "museo-slab-1", "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-weight: lighter;
+}
+
+// OTHER MIXINS --------------------------------------------------------------
+// Mixins set here will be available in defaults, screen, print and IE
+// Or anywhere you import either base.sass or defaults.sass

data/lib/caboodle/kits/susy/views/susy/_defaults.scss

@@ -0,0 +1,257 @@
+//** DEFAULT STYLES **//
+
+// Based on the work of:
+// Andy Clarke: http://forabeautifulweb.com/
+
+// Imports --------------------------------------------------------------*/
+
+@import "base";
+@import "susy/reset";
+
+/* Body --------------------------------------------------------------*/
+
+body {
+  @include serif-family;
+  color: $base;
+}
+
+/* Links --------------------------------------------------------------*/
+
+a {
+  &:link, &:visited {
+    color: $alt;
+  }
+  &:focus, &:hover, &:active {
+    color: darken($alt,5);
+    text-decoration: none;
+  }
+  img {
+    border: none;
+  }
+}
+
+/* Headings --------------------------------------------------------------*/
+
+h1, h2, h3, h4, h5, h6 { 
+  font-weight: normal;
+  img {
+    margin: 0;
+  }
+}
+
+h1 { 
+  @include adjust-font-size-to(48px);
+  @include trailer(1,48px);
+}
+
+h2 { 
+  @include adjust-font-size-to(32px);
+  @include trailer(1,32px);  
+}
+
+h3 {
+  @include adjust-font-size-to(24px);
+  @include trailer(1,24px);
+}
+
+h4 {
+  @include adjust-font-size-to(18px);
+  @include trailer(1,18px);
+}
+
+h5, h6 { 
+  @include trailer(1);
+  font-weight: bold;
+}
+
+/* Text --------------------------------------------------------------*/
+
+cite, em, dfn { 
+  font-style: italic;
+}
+
+strong, dfn { 
+  font-weight: bold;
+}
+
+sup, sub { 
+  line-height: 0;
+}
+
+abbr, acronym { 
+  border-bottom: 1px dotted;
+  cursor: help;
+}
+
+address {
+  @include trailer;
+  font-style: italic;
+}
+
+ins { 
+  text-decoration: underline;
+}
+
+del { 
+  text-decoration: line-through;
+}
+
+pre, code, tt {
+  margin: $base-rhythm-unit {
+    left: -$base-rhythm-unit;
+  };
+  padding-left: $base-rhythm-unit;
+  border-left: 1px dotted;
+  @include monospace-family;
+}
+
+pre { 
+  white-space: pre;
+}
+
+code { 
+  display: block;
+}
+
+q {
+  font-style: italic;
+  em {
+    font-style: normal;
+  } 
+}
+
+p {
+  @include trailer;
+}
+
+blockquote, q {
+  quotes : "" "";
+}
+
+blockquote { 
+  margin: $base-rhythm-unit {
+    left: -$base-rhythm-unit;
+  };
+  padding-left: $base-rhythm-unit;
+  border-left: 1px solid;
+  @include serif-family;
+  font-style: italic;
+}
+
+blockquote, q {
+  &:before, &:after { 
+    content: "";
+  }
+}
+
+/* Replaced --------------------------------------------------------------*/
+
+img {
+  vertical-align: bottom;
+}
+
+/* Lists --------------------------------------------------------------*/
+
+@mixin list-default($ol: false) {
+  margin: 0 $base-rhythm-unit $base-rhythm-unit 0;
+  @if $ol {
+    list-style: decimal;
+  } @else {
+    list-style: disc;
+  } 
+}
+
+@mixin no-style-list {
+  @include no-bullets;
+  margin: 0;
+  padding: 0;
+}
+
+ol {
+  @include list-default(ol);
+}
+
+ul {
+  @include list-default;
+}
+
+li {
+  ul, ol { 
+    list-style-type: circle;
+    margin: 0 $base-rhythm-unit $base-rhythm-unit*.5;
+  }
+}
+
+dl {
+  @include trailer;
+  @include leading-border(1px);
+  dt {
+    @include adjust-font-size-to(18px);
+    @include trailer(.5,18px);
+  }
+}
+
+dd {
+  @include trailer;
+  @include trailing-border(1px);
+}
+
+/* Tables --------------------------------------------------------------*/
+/* tables still need 'cellspacing="0"' in the markup */
+
+table {
+  @include trailer;
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0;
+}
+
+table, td, th { 
+  vertical-align: top;
+}
+
+th, thead th {
+  font-weight: bold;
+}
+
+th, td, caption {
+  padding: $base-rhythm-unit*.5;
+  text-align: left;
+  font-weight: normal;
+}
+
+th, td {
+  @include trailing-border(1px,.5);
+}
+
+tfoot { 
+  @include adjust-font-size-to(14px);
+}
+
+caption {
+  @include adjust-font-size-to(24px);
+  @include trailer(1,24px);
+}
+
+/* Forms --------------------------------------------------------------*/
+
+fieldset {
+  @include trailer;
+  @include rhythm-borders(1px);
+}
+
+legend {
+  @include adjust-font-size-to(18px);
+  font-weight: bold;
+}
+
+label {
+  font-weight: bold;
+}
+
+textarea, input:not([type="radio"]) {
+  // box-sizing will help us control the width of inputs
+  // which are otherwise very hard to manage in the grid.
+  @include box-sizing(border-box);
+  width: 100%;
+}

data/lib/caboodle/kits/susy/views/susy/ie.scss

@@ -0,0 +1,10 @@
+/* Welcome to Susy. Use this file to write IE specific override styles.
+ * Import this file using the following HTML or equivalent:
+ * <!--[if IE]>
+ *   <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
+ * <![endif]--> */
+
+// Imports --------------------------------------------------------------*/
+
+@import "base";
+

data/lib/caboodle/kits/susy/views/susy/print.scss

@@ -0,0 +1,33 @@
+/* Welcome to Susy. Use this file to define print styles.
+ * Import this file using the following HTML or equivalent:
+ * <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" /> */
+
+// Imports --------------------------------------------------------------*/
+
+@import "defaults";
+
+/* Print Defaults --------------------------------------------------------------*/
+
+@mixin print {
+  nav {
+    // no need to navigate on paper
+    display: none; 
+  }
+  * {
+    // floated elements disappear when they overflow the page
+    float: none !important; 
+    background: none;
+  }
+  body {
+    @include serif-family;
+    font-size: 12pt;
+    background: white;
+    color: black; 
+  }
+  a:link:after, a:visited:after {
+    // print target URLs next to their links
+    content: " (" attr(href) ") "; 
+  } 
+}
+
+@include print;

data/lib/caboodle/{app/stylesheets → kits/susy/views/susy}/screen.scss

@@ -69,7 +69,7 @@ header#site-header {
 section#main {
   @include full;
   header#page_title
-   {
+  {
     h1, h2 {
       @include adjust-font-size-to(48px);
       color: #aaa;
@@ -213,11 +213,11 @@ section.subsection {
     @include trailer(2,32px);
     @include columns(8,8);
     -moz-column-count: 2;
-  	-moz-column-gap: 32px;
-  	-webkit-column-count: 2;
-  	-webkit-column-gap: 32px;
-  	column-count: 2;
-  	column-gap: 32px;
+    -moz-column-gap: 32px;
+    -webkit-column-count: 2;
+    -webkit-column-gap: 32px;
+    column-count: 2;
+    column-gap: 32px;
     dl {
       dt {
         
@@ -230,57 +230,9 @@ section.subsection {
   
 }
 
-#portfolio {
-  dl {
-    @include no-style-list;
-    border: 0px !important;
-    dt {
-      @include adjust-font-size-to(24px);
-      @include slab-family;
-      @include columns(1,6);
-      border: 0px !important;
-    }
-    dd {
-      @include columns(4,6);
-      border: 0px !important;
-      .awards {
-        @include adjust-font-size-to(12px);
-      }
-    }
-  }
-}
-
-#twitter {
-  #tweets { 
-    background-color: #eee;
-    @include padding-leader(1,32px);
-    @include padding-trailer(1,32px);
-    @include trailer(2,32px);
-    @include pad(1,1);
-    .tweet {
-       display: block;
-       background-color: #fff;
-       @include box-shadow(0px, 0px, 16px, #aaaaaa);
-       @include padding-leader(1,32px);
-       @include padding-trailer(1,32px);
-       @include pad(1,1);
-       a.status_link {
-         display: block;
-         position: relative;
-         z-index: 2;
-         left: -32px;
-       }
-     }
-  }
-  #overlay {  
-    img {
-      @include trailer(1,32px);
-    }
-  }
 
-}
 
-#onepage {
+.page {
   iframe {
     width: 580px;
     height: 580px;
@@ -289,4 +241,8 @@ section.subsection {
     overflow: hidden;
     scroll: none;
   }
+}
+
+#testing {
+  background-color: red;
 }

data/lib/caboodle/kits/twitter/twitter.rb

@@ -8,6 +8,8 @@ module Caboodle
     
     required [:twitter_username]
     
-    original "http://twitter.com/#{Caboodle::Site.twitter_username}"
+    credit "http://twitter.com/#{Caboodle::Site.twitter_username}"
+    
+    add_sass ["twitter"]
   end
 end

data/lib/caboodle/kits/twitter/views/twitter.scss

@@ -0,0 +1,28 @@
+#twitter {
+  #tweets { 
+    background-color: #eee;
+    @include padding-leader(1,32px);
+    @include padding-trailer(1,32px);
+    @include trailer(2,32px);
+    @include pad(1,1);
+    .tweet {
+      display: block;
+      background-color: #fff;
+      @include box-shadow(0px, 0px, 16px, #aaaaaa);
+      @include padding-leader(1,32px);
+      @include padding-trailer(1,32px);
+      @include pad(1,1);
+      a.status_link {
+        display: block;
+        position: relative;
+        z-index: 2;
+        left: -32px;
+      }
+    }
+  }
+  #overlay {  
+    img {
+      @include trailer(1,32px);
+    }
+  }
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - steflewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +01:00
+date: 2010-08-23 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -262,55 +262,66 @@ files:
 - lib/caboodle/app/public/images/favicon.ico
 - lib/caboodle/app/public/images/grid.png
 - lib/caboodle/app/public/js/application.js
-- lib/caboodle/app/public/stylesheets/ie.css
-- lib/caboodle/app/public/stylesheets/print.css
-- lib/caboodle/app/public/stylesheets/screen.css
-- lib/caboodle/app/stylesheets/_base.scss
-- lib/caboodle/app/stylesheets/_defaults.scss
-- lib/caboodle/app/stylesheets/ie.scss
-- lib/caboodle/app/stylesheets/print.scss
-- lib/caboodle/app/stylesheets/screen.scss
 - lib/caboodle/app/views/layout.haml
+- lib/caboodle/app/views/stylesheets/_base.scss
+- lib/caboodle/app/views/stylesheets/_defaults.scss
+- lib/caboodle/app/views/stylesheets/ie.scss
+- lib/caboodle/app/views/stylesheets/print.scss
+- lib/caboodle/app/views/stylesheets/screen.scss
 - lib/caboodle/command.rb
 - lib/caboodle/config.rb
 - lib/caboodle/config/defaults.yml
 - lib/caboodle/helpers.rb
 - lib/caboodle/kit.rb
 - lib/caboodle/kits/analytics/analytics.rb
+- lib/caboodle/kits/carbonmade/carbonmade.rb
+- lib/caboodle/kits/carbonmade/views/carbonmade.haml
 - lib/caboodle/kits/disqus/disqus.rb
 - lib/caboodle/kits/disqus/views/disqus.haml
 - lib/caboodle/kits/flickr/flickr.rb
 - lib/caboodle/kits/flickr/public/galleria.noconflict.min.js
 - lib/caboodle/kits/flickr/views/photography.haml
+- lib/caboodle/kits/flickr/views/photography.scss
 - lib/caboodle/kits/github/github.rb
 - lib/caboodle/kits/github/views/_repo.haml
 - lib/caboodle/kits/github/views/github.haml
+- lib/caboodle/kits/history/config/history.yml
+- lib/caboodle/kits/history/history.rb
+- lib/caboodle/kits/history/views/history.haml
+- lib/caboodle/kits/history/views/history.scss
 - lib/caboodle/kits/identity/identity.rb
 - lib/caboodle/kits/identity/views/me.haml
+- lib/caboodle/kits/jquery/jquery.rb
 - lib/caboodle/kits/lazyload/lazyload.rb
 - lib/caboodle/kits/lazyload/public/jquery.lazyload.mini.js
 - lib/caboodle/kits/lazyload/public/lazyload.js
 - lib/caboodle/kits/linkedin/linkedin.rb
 - lib/caboodle/kits/linkedin/views/cv.haml
+- lib/caboodle/kits/linkedin/views/linkedin.scss
 - lib/caboodle/kits/onepage/onepage.rb
 - lib/caboodle/kits/onepage/views/contact.haml
 - lib/caboodle/kits/page/page.rb
 - lib/caboodle/kits/page/views/page.haml
-- lib/caboodle/kits/portfolio/config/portfolio.yml
-- lib/caboodle/kits/portfolio/portfolio.rb
-- lib/caboodle/kits/portfolio/views/portfolio.haml
 - lib/caboodle/kits/posterous/posterous.rb
 - lib/caboodle/kits/posterous/views/_post.haml
 - lib/caboodle/kits/posterous/views/post.haml
+- lib/caboodle/kits/posterous/views/posterous.scss
 - lib/caboodle/kits/posterous/views/posts.haml
 - lib/caboodle/kits/seo/seo.rb
 - lib/caboodle/kits/skimmed/skimmed.rb
 - lib/caboodle/kits/soundcloud/soundcloud.rb
 - lib/caboodle/kits/soundcloud/views/soundcloud.haml
+- lib/caboodle/kits/susy/susy.rb
+- lib/caboodle/kits/susy/views/susy/_base.scss
+- lib/caboodle/kits/susy/views/susy/_defaults.scss
+- lib/caboodle/kits/susy/views/susy/ie.scss
+- lib/caboodle/kits/susy/views/susy/print.scss
+- lib/caboodle/kits/susy/views/susy/screen.scss
 - lib/caboodle/kits/twitter/public/images/ajax-loader.gif
 - lib/caboodle/kits/twitter/public/images/link.png
 - lib/caboodle/kits/twitter/twitter.rb
 - lib/caboodle/kits/twitter/views/twitter.haml
+- lib/caboodle/kits/twitter/views/twitter.scss
 - lib/caboodle/kits/typekit/public/typekit.js
 - lib/caboodle/kits/typekit/typekit.rb
 - lib/caboodle/scrape.rb

data/lib/caboodle/app/public/stylesheets/ie.css

@@ -1 +0,0 @@
-/* Welcome to Susy. Use this file to write IE specific override styles. Import this file using the following HTML or equivalent: <!--[if IE]> <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" /> <![endif]--> */