Permalink
Browse files

Merge branch 'master' of github.com:zurb/foundation

  • Loading branch information...
2 parents d018f0b + adaea61 commit 47bc876711dce192611baed1b28d177caa80e861 @mrsweaters mrsweaters committed Nov 10, 2012
View
@@ -3,6 +3,18 @@ We'll keep you up to date with what we've released so you at least have a gist o
---
+### 3.2.1- November 9, 2012
+This patch include bug fixes for various elements, such as:
+* Adding a missing line for mqueries.scss into app.scss
+* Height of fixed magellan element
+* Update viewport tag with initial-scale
+* Dropdown button fixes
+* Clearing bug fixes
+* Added a font-smoothing variable
+* Added close support to accordions
+* Removed deep linking hashes from tabs
+* Topbar now resets on close for small layouts
+
### **3.2**- October 26, 2012
With this update we've revamped our documentation to be more organized and explain details regarding Scss, Compass and Javascripts.
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- zurb-foundation (3.2.0)
+ zurb-foundation (3.2.1)
compass (>= 0.12.2)
modular-scale (>= 1.0.2)
rake
@@ -1,3 +1,3 @@
module Foundation
- VERSION = "3.2.0"
+ VERSION = "3.2.1"
end
@@ -365,7 +365,7 @@
/* Branding and name */
&.name { background: darken($topBarBgColor, 20%); height: $topBarHeightMobile;
h1 { line-height: 1;
- a { color: $topBarLinkColor; display: block; line-height: $topBarHeightMobile !important; padding-left: $topBarHeightMobile / 2; height: $topBarHeightMobile; }
+ a { color: $topBarLinkColor; display: block; line-height: $topBarHeightMobile !important; padding-left: $topBarHeightMobile / 3; height: $topBarHeightMobile; }
}
}
&:hover, &.active { a { color: $topBarDropLinkColor; } }
@@ -443,14 +443,16 @@
}
}
}
- &>ul { height: $topBarHeight; }
section > ul li a:not(.button) { padding-left: $topBarHeightMobile / 2 !important; }
/* When the Small Nav is Showing */
&.expanded { height: 100%;
ul li.toggle-topbar a { @include cssTriangle($topBarNavToggleSize, rgba(255,255,255,0.5), bottom); top: auto; bottom: 50%; margin-bottom: -($topBarNavToggleSize / 2); }
}
}
- .top-bar ul li.has-button { padding: 0 $topBarHeightMobile / 2 5px; }
+ .top-bar ul li.has-button { padding: 5px $topBarHeightMobile / 3; }
.top-bar ul li .button.small { margin: 0 !important; display: inline-block; width: 100%; }
+ .top-bar ul > li.has-button {
+ a.button { margin: 0; }
+ }
}
@@ -44,8 +44,10 @@
/* Main Navigation links style */
&>li { float: left;
a:not(.button) { color: $topBarLinkColor; display: block; font-size: $topBarLinkSize; font-weight: $topBarLinkWeight; height: $topBarHeight; line-height: $topBarHeight; padding: 0 $topBarHeight / 3; }
- &:hover, &.active { background: darken($topBarBgColor, 15%);
- a { color: darken($topBarLinkColor, 15%); }
+ &:not(.name) {
+ &:hover, &.active { background: darken($topBarBgColor, 15%);
+ a { color: darken($topBarLinkColor, 15%); }
+ }
}
/* Dividers between navigation */
@@ -101,7 +101,7 @@
&>li { list-style: none; margin: 0; padding: 0; border-top: 1px solid $secondaryColor;
- .title { cursor: pointer; background: lighten($secondaryColor, 5%); padding: 15px; margin: 0; position: relative; border-#{$defaultFloat}: 1px solid $secondaryColor; border-#{$defaultOpposite}: 1px solid $secondaryColor; @include single-transition(0.15s, background, linear);
+ & > div.title { cursor: pointer; background: lighten($secondaryColor, 5%); padding: 15px; margin: 0; position: relative; border-#{$defaultFloat}: 1px solid $secondaryColor; border-#{$defaultOpposite}: 1px solid $secondaryColor; @include single-transition(0.15s, background, linear);
h1, h2, h3, h4, h5 { margin: 0; }
&:after { @include cssTriangle(6px, darken($secondaryColor, 30%), $defaultOpposite); position: absolute; #{$defaultOpposite}: 15px; top: 21px; }
@@ -187,9 +187,9 @@
/* Inline Link List */
ul.inline-list, ul.link-list { margin: 0 0 $linkListBottomMargin; padding: 0; list-style: none; overflow: hidden;
- li { list-style: none; float: $defaultFloat; margin-#{$defaultFloat}: 22px; display: block;
+ & > li { list-style: none; float: $defaultFloat; margin-#{$defaultFloat}: 22px; display: block;
- a { display: block; }
+ & > * { display: block; }
}
}
@@ -2,23 +2,24 @@
// Outer row mixin for container rows
- @mixin outerRow() { width: $rowWidth; max-width: 100%; min-width: $screenSmall; margin: 0 auto; @extend %clearfix; }
+ @mixin outerRow() {
+ width: $rowWidth; max-width: 100%; min-width: $screenSmall; margin: 0 auto; @extend %clearfix;
+ @include respondTo(smallScreen) { width: auto; min-width: 0; margin-left: 0; margin-right: 0; }
+ }
// Inner row mixin for nested rows, must be a child of an outer-row element. $behavior can be 'collapse' to get rid of margins
- @mixin innerRowBase { width: auto; max-width: none; min-width: 0; }
@mixin innerRow($behavior: false) {
@if $behavior == collapse { @extend %row-i-base; margin: 0; @extend %clearfix;
} @else { @extend %row-i-base; margin: 0 (-($columnGutter/2)); @extend %clearfix; }
}
// Columns mixin, syntax is ($columns, $behavior). Behavior can be 'centered' which centers things or 'collapse' which collapses the gutters. ex @include row(4,[center | collapse])
- @mixin columnBase { position: relative; min-height: 1px; padding: 0 ($columnGutter/2); }
@mixin column($columns:$columns, $behavior: false) {
- @if $behavior == center { @extend %fl-n; margin: 0 auto !important; @extend %c-base; width: gridCalc($columns, $totalColumns);
- } @else if $behavior == collapse { @extend %fl-l; @extend %c-base; padding: 0; width: gridCalc($columns, $totalColumns);
- } @else { @extend %fl-l; @extend %c-base; width: gridCalc($columns, $totalColumns); }
+ @if $behavior == center { @extend %fl-n; margin: 0 auto !important; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; }
+ } @else if $behavior == collapse { @extend %fl-l; @extend %c-base; padding: 0; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; }
+ } @else { @extend %fl-l; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; } }
}
// Offset Mixin, include after a column mixin to manipulate its grid offset.
@@ -30,8 +31,7 @@
@mixin push($push:1) { left: gridCalc($push, $totalColumns); }
@mixin pull($push:1) { right: gridCalc($push, $totalColumns); }
- // Mobile Row, synctax is @include mobile-row();
-
+ // Mobile Row, synctax is @include mobile-row(); (This mixin isn't really necessary, will be deprecated in 4)
@mixin mobileRow() { @include respondTo(smallScreen) { width: auto; min-width: 0; margin-left: 0; margin-right: 0; @include clearfix(); } }
// Mobile Columns, syntax is @include mobile-column(#);
@@ -56,10 +56,10 @@
%clearfix-m { @include mobileClearfix(); }
%row-o { @include outerRow(); }
- %row-i-base { @include innerRowBase(); }
+ %row-i-base { width: auto; max-width: none; min-width: 0; }
%row-i { @include innerRow(); }
- %c-base { @include columnBase(); }
+ %c-base { position: relative; min-height: 1px; padding: 0 ($columnGutter/2); }
@for $i from 1 through $totalColumns {
%c-#{$i} { @include column($i); }
View
@@ -33,7 +33,7 @@ <h3>Reveal &mdash; Simple, Flexible Modal Dialogs</h3>
<h4 class="subheader">Modal dialogs, or pop-up windows, are handy for prototyping and production. Foundation includes Reveal our jQuery modal plugin, to make this easy for you.</h4>
<p>
- <a href="#" data-reveal-id="exampleModal" class="radius button">
+ <a href="#" class="radius button">
Example Modal&hellip;
</a>
</p>
@@ -85,7 +85,7 @@ <h2>This modal has video</h2>
<script src="../vendor/assets/javascripts/foundation/jquery.foundation.orbit.js"></script>
<script src="../vendor/assets/javascripts/foundation/app.js"></script>
<script type="text/javascript">
- // Page-Specific JavaScript Goes Here
+ // Page-Specific JavaScript Goes Here
</script>
</body>
</html>
View
@@ -46,4 +46,5 @@
// @import "foundation/components/modules/reveal";
// @import "foundation/components/modules/offcanvas";
-body { font-size: ms(-3); }
+// Media Queries Overrides
+// @import "foundation/components/modules/mqueries";
@@ -17,7 +17,7 @@
$.fn.foundationMagellan ? $doc.foundationMagellan() : null;
$.fn.foundationClearing ? $doc.foundationClearing() : null;
- $('input, textarea').placeholder();
+ $.fn.placeholder ? $('input, textarea').placeholder() : null;
});
// UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE8 SUPPORT AND ARE USING .block-grids

0 comments on commit 47bc876

Please sign in to comment.