Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zurb/foundation
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Hayes committed Mar 1, 2013
2 parents ccfb5bf + 1446ce5 commit de3ab54
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 35 deletions.
3 changes: 3 additions & 0 deletions docs/components/block-grid.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ $base-style: true
/* We use this to control the maximum blocks and spacing */
$block-grid-elements: 12;
$block-grid-default-spacing: 10px;
/* Enables media queries for block-grid classes. Set to false if writing semantic HTML. */
$block-grid-media-queries: true
', :css %>

</div>
Expand Down
15 changes: 5 additions & 10 deletions docs/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<div class="large-4 columns">
<dl>
<dt><h5>css</h5></dt>
<dd>Includes <code>foundation.css</code> and <code>foundation.min.css</code> so you can choose which to use. We've also included <code>app.css</code> that you can use for custom styles that will sit on top of the Foundation core as overrides.</dd>
<dd>Includes <code>foundation.css</code> and <code>foundation.min.css</code> so you can choose which to use. You can add <code>app.css</code> or any other stylesheet to use for custom styles that will sit on top of the Foundation core as overrides.</dd>
</dl>
</div>
<div class="large-4 columns">
Expand Down Expand Up @@ -195,7 +195,6 @@
<h5 class="subheader">Our markup structure is straight forward and gives you the flexibility you need to create to your hearts desires. Here's an example page that includes the basics:</h5>

<%= code_example '
<!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]-->
Expand Down Expand Up @@ -258,19 +257,15 @@
<dt><h5>CSS &amp; Modernizr</h5></dt>
<dd>The default CSS download includes everything you need to get going, including necessary styles and our custom Modernizr script.</dd>
<dt>CSS</dt>
<dd>We include <code>foundation.min.css</code> and <code>foundation.css</code>. The difference here is whether or not you want minified code or not (link whichever you want, but not both). You'll also notice <code>app.css</code>, which can be used for your own Foundation overrides.</dd>
<dt>Modernizr</dt>
<dd>We use this to give us the HTML5 Shiv, touch classes and JS media queries that help us control Foundation.</dd>
<dd>We include <code>foundation.min.css</code> and <code>foundation.css</code>. The difference here is whether or not you want minified code or not (link whichever you want, but not both).</dd>
</dl>
</div>
<div class="large-4 columns">
<dl>
<dt>Modernizr</dt>
<dd>We use this to give us the HTML5 Shiv, touch classes and JS media queries that help us control Foundation.</dd>
<dt><h5>Javascripts</h5></dt>
<dd>Our JS is linked up right before the closing body tag and includes all necessary plugins and initializers to hit the ground running.</dd>
<dt>jQuery</dt>
<dd>We stay as close as possible to the latest version of jQuery at all times. jQuery needs to be included before any Foundation JS.</dd>
<dt>Foundation JS</dt>
<dd>We include <code>foundation.min.js</code> by default, which includes all the available plugins. If you want to customize, we have every individual plugin commented for you to quickly pick and choose.</dd>
</dl>
</div>
</div>
Expand All @@ -280,7 +275,7 @@
<div class="panel">
<h3>Get going!</h3>
<h5 class="subheader">Now that you understand the gist of what Foundation is and how it works, it's time to start a project! We've got two different ways for you to build projects with Foundation, a Compass Gem using Scss or a with plain CSS.</h5>
<a href="sass.html" class="button">Using the Gem</a></li>
<a href="./sass.html" class="button">Using the Gem</a></li>
<a href="http://foundation.zurb.com/migration.php" class="button secondary">Quickstart with CSS</a></li>
</div>

Expand Down
4 changes: 2 additions & 2 deletions docs/javascript.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<h2>Configuration</h2>

<p>Foundation accepts a myriad of options for initialization. By default, calling <code>$('#scope').foundation();</code> will intialize all available plugins on the page. Alternatively, you can pass individual plugins along with configuration options and a callback. This will allow you to select specific plugins to start on your page, even if their source is included. You can take a look at the call here:</p>
<p>Foundation accepts a myriad of options for initialization. By default, calling <code>$('#scope').foundation();</code> will initialize all available plugins on the page. Alternatively, you can pass individual plugins along with configuration options and a callback. This will allow you to select specific plugins to start on your page, even if their source is included. You can take a look at the call here:</p>

<%= code_example "
$(document).foundation('section', {deep_linking: true}, function (response) {
Expand Down Expand Up @@ -107,7 +107,7 @@ $(document)

<h2>Calling Internal Methods</h2>

<p>Foundation 4 JavaScript allows you call call internal plugin methods by passing the method name as the second argument. This is necessary for plugins like Joyride, since they are not intialized on page load by default.</p>
<p>Foundation 4 JavaScript allows you call call internal plugin methods by passing the method name as the second argument. This is necessary for plugins like Joyride, since they are not initialized on page load by default.</p>

<p>This will fire the <code>start</code> method on Joyride:</p>

Expand Down
2 changes: 1 addition & 1 deletion js/foundation/foundation.section.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
.attr('style', '');
}
} else {
if (!self.small(parent) || self.settings.one_up) {
if (self.small(parent) || self.settings.one_up) {
$this
.closest('[data-section]')
.find('section, .section')
Expand Down
33 changes: 18 additions & 15 deletions scss/foundation/components/_block-grid.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
$block-grid-elements: 12 !default;
$block-grid-default-spacing: 10px !default;

// Enables media queries for block-grid classes. Set to false if writing semantic HTML.
$block-grid-media-queries: true !default;

//
// Block Grid Mixins
Expand Down Expand Up @@ -39,25 +41,26 @@ $block-grid-default-spacing: 10px !default;

}

@if $block-grid-media-queries {
/* Foundation Block Grids for below small breakpoint */
@media only screen {
[class*="block-grid-"] { @include block-grid; }

/* Foundation Block Grids for below small breakpoint */
@media only screen {
[class*="block-grid-"] { @include block-grid; }

@for $i from 2 through $block-grid-elements {
.small-block-grid-#{($i)} {
@include block-grid($i,$block-grid-default-spacing,false);
@for $i from 2 through $block-grid-elements {
.small-block-grid-#{($i)} {
@include block-grid($i,$block-grid-default-spacing,false);
}
}
}
}

/* Foundation Block Grids for above small breakpoint */
@media #{$small} {
@for $i from 2 through $block-grid-elements {
.large-block-grid-#{($i)} {
@if $i == 2 { @include block-grid(2,15px,false); }
@else if $i == 3 { @include block-grid(3,12px,false); }
@else { @include block-grid($i,$block-grid-default-spacing,false); }
/* Foundation Block Grids for above small breakpoint */
@media #{$small} {
@for $i from 2 through $block-grid-elements {
.large-block-grid-#{($i)} {
@if $i == 2 { @include block-grid(2,15px,false); }
@else if $i == 3 { @include block-grid(3,12px,false); }
@else { @include block-grid($i,$block-grid-default-spacing,false); }
}
}
}
}
2 changes: 1 addition & 1 deletion scss/foundation/components/_button-groups.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
&.round li { @include button-group-style($radius:1000px, $float:null); }

@for $i from 2 through 8 {
&.even#{-$i} li { @include button-group-style($even:3, $float:null); }
&.even#{-$i} li { @include button-group-style($even:$i, $float:null); }
}
}

Expand Down
20 changes: 14 additions & 6 deletions scss/foundation/components/_type.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ $microformat-abbr-font-decoration: none !default;
//
// Typography Placeholders
//

%lead {
font-size: $paragraph-font-size + emCalc(3.5px);
line-height: 1.6;
Expand Down Expand Up @@ -178,9 +177,9 @@ h1, h2, h3, h4, h5, h6 {
font-style: $header-font-style;
color: $header-font-color;
text-rendering: $header-text-rendering;
line-height: $header-line-height;
margin-top: $header-top-margin;
margin-bottom: $header-bottom-margin;
line-height: $header-line-height - emCalc(3px);

small {
font-size: $small-font-size;
Expand All @@ -189,10 +188,10 @@ h1, h2, h3, h4, h5, h6 {
}
}

h1 { font-size: $h1-font-size; }
h2 { font-size: $h2-font-size; }
h3 { font-size: $h3-font-size; }
h4 { font-size: $h4-font-size; }
h1 { font-size: $h1-font-size - emCalc(10px); }
h2 { font-size: $h2-font-size - emCalc(10px); }
h3 { font-size: $h3-font-size - emCalc(5px); }
h4 { font-size: $h4-font-size - emCalc(5px); }
h5 { font-size: $h5-font-size; }
h6 { font-size: $h6-font-size; }

Expand Down Expand Up @@ -350,6 +349,15 @@ blockquote p {
}
}


@media #{$small} {
h1,h2,h3,h4,h5,h6 { line-height: $header-line-height; }
h1 { font-size: $h1-font-size; }
h2 { font-size: $h2-font-size; }
h3 { font-size: $h3-font-size; }
h4 { font-size: $h4-font-size; }
}

// Only include these styles if you want them.
@if $include-print-styles {
/*
Expand Down

0 comments on commit de3ab54

Please sign in to comment.