zurb-foundation 4.0.5 → 4.0.7

data/templates/project/scss/_settings.scss

@@ -376,7 +376,7 @@
 // $crumb-border-size: 1px;
 // $crumb-border-style: solid;
 // $crumb-border-color: darken($crumb-bg, $crumb-function-factor);
-// $crumb-radius: $button-radius;
+// $crumb-radius: $global-radius;
 
 // We use these to set various text styles for breadcrumbs.
 // $crumb-font-size: emCalc(11px);
@@ -573,7 +573,7 @@
 // $keystroke-border-style: solid;
 // $keystroke-border-width: 1px;
 // $keystroke-border-color: darken($keystroke-bg, $keystroke-function-factor);
-// $keystroke-radius: $button-radius;
+// $keystroke-radius: $global-radius;
 
 //
 // Label Variables
@@ -581,7 +581,7 @@
 
 // We use these to style the labels
 // $label-padding: emCalc(3px) emCalc(10px) emCalc(4px);
-// $label-radius: $button-radius;
+// $label-radius: $global-radius;
 
 // We use these to style the label text
 // $label-font-size: emCalc(14px);
@@ -732,7 +732,7 @@
 // $progress-bar-border-color: darken(#fff, 20%);
 // $progress-bar-border-size: 1px;
 // $progress-bar-border-style: solid;
-// $progress-bar-border-radius: $button-radius;
+// $progress-bar-border-radius: $global-radius;
 
 // We use these to control the margin & padding
 // $progress-bar-pad: emCalc(2px);

data/templates/project/scss/app.scss

@@ -7,21 +7,21 @@
 // Import specific parts of Foundation by commenting the import "foundation"
 // and uncommenting what you want below. You must uncomment the following if customizing
 
-// @import "foundation/foundation-global";
-// @import "foundation/components/global";
+// @import "foundation/foundation-global"; // *always required
+// @import "foundation/components/global"; // *always required
 // @import "foundation/components/grid";
 // @import "foundation/components/visibility";
 // @import "foundation/components/block-grid";
 // @import "foundation/components/type";
 // @import "foundation/components/buttons";
-// @import "foundation/components/forms";
-// @import "foundation/components/custom-forms";
-// @import "foundation/components/button-groups";
-// @import "foundation/components/dropdown-buttons";
-// @import "foundation/components/split-buttons";
+// @import "foundation/components/forms"; // *requires components/buttons
+// @import "foundation/components/custom-forms"; // *requires components/buttons, components/forms
+// @import "foundation/components/button-groups"; // *requires components/buttons
+// @import "foundation/components/dropdown-buttons"; // *requires components/buttons
+// @import "foundation/components/split-buttons"; // *requires components/buttons
 // @import "foundation/components/flex-video";
 // @import "foundation/components/section";
-// @import "foundation/components/top-bar";
+// @import "foundation/components/top-bar";  // *requires components/grid
 // @import "foundation/components/orbit";
 // @import "foundation/components/reveal";
 // @import "foundation/components/joyride";

data/templates/upgrade/manifest.rb

@@ -1,15 +1,8 @@
 description 'Foundation Compass Gem'
 
-# Images exist in non-standard location so they will play nicely with
-# Rails asset-pipeline.  So this method allows us to copy images from
-# outside the compass template
-def copy_images_from(relative_path, prefix_path)
-  absolute_path = File.join(File.dirname(__FILE__), relative_path, prefix_path)
-  Dir.glob("#{absolute_path}/*.*") do |img|
-    image "#{relative_path}/#{prefix_path}/#{File.basename(img)}", 
-      :to => "#{prefix_path}/#{File.basename(img)}"
-  end
-end
+stylesheet '../project/scss/_settings.scss', :to => '_settings.scss'
+stylesheet '../project/scss/app.scss', :to => 'app.scss'
+stylesheet '../../scss/normalize.scss', :to => 'normalize.scss', :media => "screen, projector, print"
 
 def copy_js_from(relative_path, prefix_path, excludes=[])
   absolute_path = File.join(File.dirname(__FILE__), relative_path, prefix_path)
@@ -21,8 +14,10 @@ def copy_js_from(relative_path, prefix_path, excludes=[])
   end
 end
 
-copy_images_from("../../vendor/assets/images", "foundation/orbit")
-copy_js_from("../../vendor/assets/javascripts", "foundation", ["app.js","index.js"])
+javascripts = copy_js_from("../../js", "foundation", ["index.js"])
+copy_js_from("../../js", "vendor")
+
+html '../project/index.html', :erb => true, :javascripts => javascripts, :version => Foundation::VERSION, :to => 'upgrade.html'
 
 help %Q{
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zurb-foundation
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -52,7 +52,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
-- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -60,6 +59,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- docs/CHANGELOG.md
 - docs/Capfile
 - docs/Gemfile
 - docs/Gemfile.lock
@@ -80,6 +80,7 @@ files:
 - docs/components/dropdown.html.erb
 - docs/components/flex-video.html.erb
 - docs/components/forms.html.erb
+- docs/components/global.html.erb
 - docs/components/grid.html.erb
 - docs/components/inline-lists.html.erb
 - docs/components/joyride.html.erb
@@ -138,7 +139,6 @@ files:
 - docs/sass.html.erb
 - docs/support.html.erb
 - foundation.gemspec
-- index.html
 - js/foundation/foundation.alerts.js
 - js/foundation/foundation.clearing.js
 - js/foundation/foundation.cookie.js
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 289427186868157040
+      hash: -3158140803061983310
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 289427186868157040
+      hash: -3158140803061983310
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/index.html

@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-  <meta charset="utf-8" />
-
-  <!-- Set the viewport width to device width for mobile -->
-  <meta name="viewport" content="width=device-width" />
-
-  <title>Welcome to Foundation</title>
-
-  <!-- Included CSS Files -->
-  <link rel="stylesheet" href="docs/css/foundation.css">
-
-  <script src="js/vendor/custom.modernizr.js"></script>
-
-</head>
-<body>
-
-  <div class="row">
-    <div class="twelve columns">
-      <h2>Welcome to Foundation</h2>
-      <p>This is version 4.0 released on SOON :).</p>
-      <hr />
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="eight columns">
-      <h3>The Grid</h3>
-
-      <!-- Grid Example -->
-      <div class="row">
-        <div class="twelve columns">
-          <div class="panel">
-            <p>This is a twelve column section in a row. Each of these includes a div.panel element so you can see where the columns are - it's not required at all for the grid.</p>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="six columns">
-          <div class="panel">
-            <p>Six columns</p>
-          </div>
-        </div>
-        <div class="six columns">
-          <div class="panel">
-            <p>Six columns</p>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="four columns">
-          <div class="panel">
-            <p>Four columns</p>
-          </div>
-        </div>
-        <div class="four columns">
-          <div class="panel">
-            <p>Four columns</p>
-          </div>
-        </div>
-        <div class="four columns">
-          <div class="panel">
-            <p>Four columns</p>
-          </div>
-        </div>
-      </div>
-
-      <h3>Tabs</h3>
-      <dl class="tabs">
-        <dd class="active"><a href="#simple1">Simple Tab 1</a></dd>
-        <dd><a href="#simple2">Simple Tab 2</a></dd>
-        <dd><a href="#simple3">Simple Tab 3</a></dd>
-      </dl>
-
-      <ul class="tabs-content">
-        <li class="active" id="simple1Tab">This is simple tab 1's content. Pretty neat, huh?</li>
-        <li id="simple2Tab">This is simple tab 2's content. Now you see it!</li>
-        <li id="simple3Tab">This is simple tab 3's content. It's, you know...okay.</li>
-      </ul>
-
-      <h3>Buttons</h3>
-
-      <div class="row">
-        <div class="six columns">
-          <p><a href="#" class="small button">Small Button</a></p>
-          <p><a href="#" class="button">Medium Button</a></p>
-          <p><a href="#" class="large button">Large Button</a></p>
-        </div>
-        <div class="six columns">
-          <p><a href="#" class="small alert button">Small Alert Button</a></p>
-          <p><a href="#" class="success button">Medium Success Button</a></p>
-          <p><a href="#" class="large secondary button">Large Secondary Button</a></p>
-        </div>
-      </div>
-    </div>
-
-    <div class="four columns">
-      <h4>Getting Started</h4>
-      <p>We're stoked you want to try Foundation! To get going, this file (index.html) includes some basic styles you can modify, play around with, or totally destroy to get going.</p>
-
-      <h4>Other Resources</h4>
-      <p>Once you've exhausted the fun in this document, you should check out:</p>
-      <ul class="disc">
-        <li><a href="http://foundation.zurb.com/docs">Foundation Documentation</a><br />Everything you need to know about using the framework.</li>
-        <li><a href="http://github.com/zurb/foundation">Foundation on Github</a><br />Latest code, issue reports, feature requests and more.</li>
-        <li><a href="http://twitter.com/foundationzurb">@foundationzurb</a><br />Ping us on Twitter if you have questions. If you build something with this we'd love to see it (and send you a totally boss sticker).</li>
-      </ul>
-    </div>
-  </div>
-</body>
-</html>