From: Jordan Humphreys Date: Fri, 29 Jun 2012 04:05:12 +0000 (-0700) Subject: fix some copy. X-Git-Tag: v3.0.0.rc3~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5682616d23c5123216b280671dca9cecfaaefa45;p=thirdparty%2Ffoundation%2Ffoundation-sites.git fix some copy. --- diff --git a/marketing/docs/gem-install.php b/marketing/docs/gem-install.php index c6b7a0194..a1d8add36 100644 --- a/marketing/docs/gem-install.php +++ b/marketing/docs/gem-install.php @@ -39,7 +39,7 @@

Now you should have a new project folder created with foundation included along with all the awesome advantages that comes with SASS and Compass.

Adding Foundation to an existing project
diff --git a/marketing/docs/grid.php b/marketing/docs/grid.php index 22944e131..0cb02a06f 100644 --- a/marketing/docs/grid.php +++ b/marketing/docs/grid.php @@ -182,7 +182,7 @@

Offsets

-

Offsets allow you to create additional space between columns in a row. The offsets run from offset-by-one all the way up to offset-by-eleven. Like the rest of the grid they're nestable.

+

Offsets allow you to create additional space between columns in a row. The offsets run from offset-by-one all the way up to offset-by-eleven. Like the rest of the grid, they're nestable.

diff --git a/marketing/docs/includes/_documentation_head.php b/marketing/docs/includes/_documentation_head.php index d7f73198c..7c0ccade6 100644 --- a/marketing/docs/includes/_documentation_head.php +++ b/marketing/docs/includes/_documentation_head.php @@ -80,13 +80,13 @@

Everything you need to know to build for the future.

- + - - - - Menu + + + + Menu
diff --git a/marketing/docs/index.php b/marketing/docs/index.php index 36ad22e65..00b120393 100644 --- a/marketing/docs/index.php +++ b/marketing/docs/index.php @@ -6,7 +6,7 @@

Welcome to Foundation 3.

-

Foundation 3 is built on 14 years of experience at ZURB building sites and apps for the Web. We believe designing responsively — designing for all devices and any device — is the future. Foundation is our way of helping you do that. What changed in Foundation 3? Almost everything. Here's what makes Foundation, Foundation.

+

Foundation 3 is built on ZURB's 14 years of experience at building sites and apps for the Web. We believe designing responsively — designing for all devices and any device — is the future. Foundation is our way of helping you do that. What changed in Foundation 3? Almost everything. Here's what makes Foundation, Foundation.

@@ -38,7 +38,7 @@

Buttons are one of the core interactive elements of the Web. We've included styles and patterns for buttons that make it simple to create everything from simple marketing CTAs to complex application toolbars.

Forms

-

A combination of robust, extensible form styles and the built-in power of the Foundation Grid means you can create simple or complicated forms quickly and easily. Validation states, custom select and radio buttons and more are included.

+

A combination of robust, extensible form styles and the built-in power of the Foundation Grid means you can create simple or complicated forms quickly and easily; validation states, custom select and radio buttons and more are included.

diff --git a/marketing/download.php b/marketing/download.php index 34f1b8a05..d77579e6d 100644 --- a/marketing/download.php +++ b/marketing/download.php @@ -52,7 +52,7 @@
    -
  • Kitchen sync
    • +
  • Kitchen sync
  • Body and misc styles
  • Global typography elements
  • Responsive grid
    • @@ -144,7 +144,7 @@
    - +
    px diff --git a/marketing/javascripts/download.js b/marketing/javascripts/download.js new file mode 100644 index 000000000..cdab50bf5 --- /dev/null +++ b/marketing/javascripts/download.js @@ -0,0 +1,3 @@ +(function ($) { + console.log('fire'); +}); \ No newline at end of file diff --git a/vendor/assets/javascripts/foundation/jquery.offcanvas.js b/vendor/assets/javascripts/foundation/jquery.offcanvas.js index 68570d480..334692876 100644 --- a/vendor/assets/javascripts/foundation/jquery.offcanvas.js +++ b/vendor/assets/javascripts/foundation/jquery.offcanvas.js @@ -1,7 +1,7 @@ $(function() { // Set the negative margin on the top menu for slide-menu pages var $selector1 = $('#topMenu'), - events = 'click.fndtn touchstart.fndtn'; + events = 'click.fndtn'; if ($selector1.length > 0) $selector1.css("margin-top", $selector1.height() * -1); // Watch for clicks to show the sidebar @@ -22,12 +22,12 @@ $(function() { }); } - // Adjust sidebars and sizes when resized - $(window).resize(function() { - $('body').removeClass('active'); - var $selector4 = $('#topMenu'); - if ($selector4.length > 0) $selector4.css("margin-top", $selector4.height() * -1); - }); + // // Adjust sidebars and sizes when resized + // $(window).resize(function() { + // // if (!navigator.userAgent.match(/Android/i)) $('body').removeClass('active'); + // var $selector4 = $('#topMenu'); + // if ($selector4.length > 0) $selector4.css("margin-top", $selector4.height() * -1); + // }); // Switch panels for the paneled nav on mobile var $selector5 = $('#switchPanels');