Skip to content

Commit

Permalink
add foundation for future
Browse files Browse the repository at this point in the history
  • Loading branch information
stefl committed Jan 20, 2013
1 parent 0a5399c commit 0696242
Show file tree
Hide file tree
Showing 6 changed files with 6,229 additions and 93 deletions.
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ gem 'sinatra-flash', :require => 'sinatra/flash'
gem 'haml'
gem 'dalli'
gem "jekyll", :git => "git://github.com/stefl/jekyll.git"
gem "compass", "0.12.2.rc.0"
gem "susy", "1.0.rc.0"
gem "compass" #, "0.12.2.rc.0"
gem "susy" #, "1.0.rc.0"
gem 'padrino', '0.10.5'
gem 'unicorn'
gem 'twitter'
Expand All @@ -18,3 +18,4 @@ gem 'dalli'
gem 'resque'
gem 'hirefire'
gem 'mongoid'
gem 'zurb-foundation'
38 changes: 25 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ GEM
albino (1.3.3)
posix-spawn (>= 0.3.6)
builder (3.0.0)
chunky_png (1.2.5)
chunky_png (1.2.7)
classifier (1.3.3)
fast-stemmer (>= 1.0.0)
compass (0.12.2.rc.0)
compass (0.13.alpha.0)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
sass (~> 3.2.0.alpha.93)
dalli (2.0.3)
diff-lcs (1.1.3)
directory_watcher (1.4.1)
Expand Down Expand Up @@ -69,7 +69,7 @@ GEM
http_router (0.10.2)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.6.0)
i18n (0.6.1)
kgio (2.7.4)
kramdown (0.13.6)
launchy (2.1.2)
Expand All @@ -79,14 +79,18 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
mime-types (1.19)
modular-scale (1.0.6)
compass (>= 0.12.1)
sass (>= 3.2.0)
sassy-math (>= 1.5)
mongoid (3.0.3)
activemodel (~> 3.1)
moped (~> 1.1)
origin (~> 1.0)
tzinfo (~> 0.3.22)
moped (1.2.0)
multi_json (1.3.4)
multi_json (1.5.0)
multipart-post (1.1.5)
netrc (0.7.7)
nokogiri (1.5.5)
Expand Down Expand Up @@ -122,8 +126,8 @@ GEM
padrino-core (= 0.10.5)
polyglot (0.3.3)
posix-spawn (0.3.6)
rack (1.4.1)
rack-protection (1.2.0)
rack (1.4.4)
rack-protection (1.3.2)
rack
raindrops (0.8.0)
rake (0.9.2.2)
Expand All @@ -140,11 +144,13 @@ GEM
rubyzip (0.9.9)
rush (0.6.8)
session
sass (3.2.0.alpha.242)
sass (3.2.5)
sassy-math (1.5)
compass (~> 0.11)
session (3.1.0)
fattr
simple_oauth (0.1.8)
sinatra (1.3.2)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
Expand All @@ -155,7 +161,7 @@ GEM
sass (>= 3.2.0.alpha.237)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter (2.4.0)
Expand All @@ -172,12 +178,17 @@ GEM
rack
vegas (0.1.11)
rack (>= 1.0.0)
zurb-foundation (3.2.4)
compass (>= 0.12.2)
modular-scale (= 1.0.6)
rake
sass (>= 3.2.0)

PLATFORMS
ruby

DEPENDENCIES
compass (= 0.12.2.rc.0)
compass
dalli
dropbox-api
haml
Expand All @@ -190,6 +201,7 @@ DEPENDENCIES
rake
resque
sinatra-flash
susy (= 1.0.rc.0)
susy
twitter
unicorn
zurb-foundation
78 changes: 78 additions & 0 deletions app/stylesheets/_settings.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
$headers_and_buttons: "ratio", sans-serif;
$body_face: "ff-tisa-web-pro",serif;
@import "foundation/common/ratios";

// Settings file containing Foundation defaults

// Grid Settings

// $rowWidth: 1000px;
// $columnGutter: 30px;
// $totalColumns: 12;
// $mobileTotalColumns: 4;

// Colors Settings

$mainColor: $link-color;
$secondaryColor: #aaa;
// $alertColor: #c60f13;
$successColor: #00abe3;
// $txtColor: #222;
// $highlightColor: #ffff99;
// $black: #000;
// $white: #fff;
// $shinyEdge: rgba(#fff, .5);
// $darkEdge: rgba(#000, .2);

// Typography Settings

$headerFontFamily: $headers_and_buttons;
// $headerFontWeight: bold;
// $headerFontColor: #222;
$bodyFontFamily: $body_face;
// $bodyFontWeight: normal;
// $bodyFontColor: #222;

// Button Settings

$buttonRadius: 4px;
$btnBase: 10px;

// $tinyBtnBase: $btnBase - 5;
// $smallBtnBase: $btnBase - 3;
// $largeBtnBase: $btnBase + 5;

// Form Settings

// $formSpacing: 12px;

// Tab Settings

// $tabHeight: 40px;

// Nav Bar Settings

// $navBarHeight: 40px;
// $navFlyoutBaseWidth: 250px;

// Modular Scale
// $ratio: $golden;
$baseFontSize: 16px;
// $importantModNum: 44px;

// Tooltip Settings
// $hasTipBorderBottom: dotted 1px #ccc;
// $hasTipFontWeight: bold;
// $hasTipFontColor: #333;
// $hasTipBorderBottomHover: dotted 1px darken($mainColor, 20%);
// $hasTipFontColorHover: $mainColor;
// $tooltipBackgroundColor: #000;
// $tooltipBackgroundOpacity: 0.85;
// $tooltipFontSize: 12;
// $tooltipFontWeight: bold;
// $tooltipFontColor: #fff;
// $tapToCloseFontSize: 10;
// $tapToCloseFontWeight: normal;
// $tapToCloseFontColor: #888;
// $tooltipFontSizeScreenSmall: 14;
// $tooltipBackgroundOpacityScreenSmall: 0.85;
12 changes: 10 additions & 2 deletions app/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ $container-style: magic;
$background-color: #f8faf4;
$link-color: #8a4945;

// You custom settings file to override Foundation defaults
@import "settings";

// Comment out this import if you are customizing you imports below
@import "foundation";



@import "susy";

@include establish-baseline;
Expand Down Expand Up @@ -88,8 +96,8 @@ body {
@include omega();
}
.content {
@include prefix(3);
@include span-columns(8,14);
@include prefix(2);
@include span-columns(10,14);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions config.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require "susy"
require "zurb-foundation"

http_path = "/"
cache_dir = "tmp/sass-cache"
Expand Down
Loading

0 comments on commit 0696242

Please sign in to comment.