Skip to content

Commit bc06343

Browse files
author
Mark Hayes
committed
Merge branch '3.2-wip'
2 parents af93b7c + ed56dd9 commit bc06343

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3976
-1171
lines changed

‎.rbenv-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.9.3-p194

‎CHANGELOG.md‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Changelog
2+
We'll keep you up to date with what we've released so you at least have a gist of what goes into each update. For the most part, we'll try to list things out as detailed as we see necessary.
3+
4+
---
5+
6+
### 3.1.1- September 19, 2012
7+
Updating Top Bar navigation implementation pattern to wrap `.contain-to-grid` and/or `.fixed` around the `nav` element to prevent horizontal scroll bars when using `.contain-to-grid`. Updated the topBar breakpoint option so users only need to update the Scss variable.
8+
9+
### **3.1**- September 14, 2012
10+
Launched new features, a new Add-ons section to the marketing site, Right to left language support, and fixed bugs.
11+
12+
With this release of Foundation, we include:
13+
* Downloadable HTML template pages that can be copy/pasted into an existing project or added to your project upon downloading from the customizer.
14+
* The Add-on's section includes a round-up of all the playground pieces, etc that aren't officially included in Foundation, but built to work with it. This includes: [Templates](http://foundation.zurb.com/templates.php), [Icon Fonts](http://foundation.zurb.com/icon-fonts.php), [Off-Canvas Layouts](http://foundation.zurb.com/off-canvas.php), [Responsive Tables](http://foundation.zurb.com/responsive-tables.php), [SVG Social Icons](http://foundation.zurb.com/social-icons.php), and [Omnigraffle Stencils](http://foundation.zurb.com/stencils.php).
15+
* Foundation now includes a [responsive top navigation](http://foundation.zurb.com/navigation.php) bar that lets you have control over when it responds and what you include in it. We've made it really easy to customize using Scss.
16+
* Right-to-left language support straight out of the box. You can adjust this in the settings.scss file or upon downloading with the customizer.
17+
* New UI Styles for Progress Bars and Image Thumbs.
18+
* Updated to include jQuery 1.8.1
19+
* Orbit thumbnail documentation.
20+
* Better Reveal size documentation.
21+
22+
### 3.0.9- August 14, 2012
23+
Bug fixes and locking down dependencies.
24+
25+
### 3.0.8- August 10, 2012
26+
Numerous bugfixes. Added media query toggle plugin. Removed marketing site from repository and included a new `test/` directory to help contributors test patches.
27+
28+
New features: Media Query Toggler, block-grid mobile layouts, font-size customizer options and included modular scale gem as dependancy for SCSS version.
29+
30+
### 3.0.7- July 30, 2012
31+
Numerous JS bug fixes, added generators for Rails and refactored SCSS directory for better maintainability and scalability over time. CSS files weren't affected by this refactoring.
32+
33+
### 3.0.6- July 20, 2012
34+
Numerous bugfixes including dropdown buttons on touch devices, Modernizr update with IE8Compat, split button colors, and more. Split out the functions in app.js to be part of the Gem and only initialized in app.js, so you can keep a clean distinction between your JS and Foundation's (if you want to). Added an [accordion](http://foundation.zurb.com/elements.php) element.
35+
36+
### 3.0.5- July 10, 2012
37+
Fixed Compass performance issues by separating out each Foundation file and removing extraneous imports.
38+
39+
### 3.0.4- July 6, 2012
40+
Fixed a number of bugs around the Sass/Gem installs and documentation. Some smaller items:
41+
* Fixed a bug with dropdown buttons to allow clicking on their anchors again.
42+
* Added styles for HTML5 (and other) input styles, not just text.
43+
* Added error states back to the forms documentation.
44+
* Flyouts in a nav bar can now expand up as well as down.
45+
* In SCSS you can now set $base-size correctly, but we're still working to correct modifying the $ratio variable.
46+
47+
### 3.0.1 to 3.0.3- July 2 to July 4, 2012
48+
Various bug fixes with the downloader, gem, and Sass install.
49+
50+
### **3.0**- June 30, 2012
51+
Initial launch of Foundation 3, deprecating Foundation 2.2.1. Major enhancements include Sass/SCSS development, new grid system with box-sizing: border-box, new form styles, new UI elements, retooled download and install options, new docs, new marketing site.

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
zurb-foundation (3.1.1)
4+
zurb-foundation (3.2.0.rc1)
55
compass (>= 0.12.2)
66
modular-scale (>= 1.0.2)
77
rake

‎index.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<!DOCTYPE html>
22

33
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
4-
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
5-
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
64
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
75
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
86
<head>

‎lib/foundation/generators/USAGE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Description:
33

44
Example:
55
rails g foundation:install
6-
6+
77
This will replace the default application assets:
88
/app/assets/javascripts/application.js
99
/app/assets/stylesheets/application.css

‎lib/foundation/generators/layout_generator.rb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ class LayoutGenerator < Rails::Generators::Base
77
argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
88

99
class_option :haml, :desc => 'Generate HAML layout instead of ERB.', :type => :boolean
10-
10+
class_option :slim, :desc => 'Generate Slim layout instead of ERB.', :type => :boolean
11+
1112
def create_layout
1213
if options.haml?
1314
template 'application.html.haml', "app/views/layouts/#{file_name}.html.haml"
@@ -17,11 +18,11 @@ def create_layout
1718
template 'application.html.erb', "app/views/layouts/#{file_name}.html.erb"
1819
end
1920
end
20-
21+
2122
private
2223
def file_name
2324
layout_name.underscore.downcase
2425
end
2526
end
2627
end
27-
end
28+
end

‎lib/foundation/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Foundation
2-
VERSION = "3.1.1"
2+
VERSION = "3.2.0.rc1"
33
end

‎marketing/.rbenv-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.9.3-p194

‎scss/foundation.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@charset "UTF-8";
2-
32
// Foundation Features
43
// =============
54

@@ -16,3 +15,6 @@
1615
@import "foundation/common/base";
1716

1817
@import "foundation/components/grid", "foundation/components/modules/all";
18+
19+
// Media Queries Overrides
20+
@import "foundation/components/modules/mqueries";

‎scss/foundation/_settings.scss‎

Lines changed: 156 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,7 @@ $rowWidth: 1000px !default;
66
$columnGutter: 30px !default;
77
$totalColumns: 12 !default;
88
$mobileTotalColumns: 4 !default;
9-
10-
// Text Direction Settings
11-
12-
$textDirection: ltr !default; // Controls default global text direction, 'rtl' or 'ltr'
13-
$defaultFloat: left !default; // Change this to 'right' for right-to-left languages
14-
$defaultOpposite: right !default; // Change this to 'left' for right-to-left languages
15-
16-
@if $textDirection == ltr {
17-
$defaultFloat: left;
18-
$defaultOpposite: right;
19-
} @else {
20-
$defaultFloat: right;
21-
$defaultOpposite: left;
22-
}
9+
$blockGridElements: 12 !default; // Highest number of block grid elements, Maximum of 24 supported
2310

2411
// Colors Settings
2512

@@ -45,6 +32,20 @@ $bodyFontWeight: normal !default;
4532
$bodyFontStyle: normal !default;
4633
$bodyFontColor: $txtColor !default;
4734

35+
// Text Direction Settings
36+
37+
$textDirection: ltr !default; // Controls default global text direction, 'rtl' or 'ltr'
38+
$defaultFloat: left !default; // Change this to 'right' for right-to-left languages
39+
$defaultOpposite: right !default; // Change this to 'left' for right-to-left languages
40+
41+
@if $textDirection == ltr {
42+
$defaultFloat: left;
43+
$defaultOpposite: right;
44+
} @else {
45+
$defaultFloat: right;
46+
$defaultOpposite: left;
47+
}
48+
4849
// Button Settings
4950

5051
$buttonRadius: 3px !default;
@@ -57,77 +58,180 @@ $largeBtnBase: $btnBase + 5 !default;
5758
// Form Settings
5859

5960
$formSpacing: 12px !default;
61+
$labelFontWeight: 500 !default;
62+
$labelFontColor: lighten(#000, 30%) !default;
63+
$labelBtmMargin: 3px !default;
64+
$inputFontColor: rgba(0,0,0,0.75) !default;
65+
$inputFontSize: 14px !default;
66+
$inputBgColor: #fff !default;
67+
$inputFocusBgColor: darken(#fff, 2%) !default;
68+
$inputBorderColor: darken(#fff, 20%) !default;
69+
$inputFocusBorderColor: darken(#fff, 30%) !default;
70+
$inputBorderStyle: solid !default;
71+
$inputBorderWidth: 1px !default;
72+
$inputBorderRadius: 2px !default;
73+
$fieldsetBorderRadius: 3px !default;
74+
75+
// Custom Form Settings
76+
77+
$custFormBorderColor: #ccc !default;
78+
$custFormBgColor: #fff !default;
79+
$custCheckColor: #222 !default;
80+
$custSelectCurrentFontColor: #141414 !default;
81+
$custSelectBgColor: #fff !default;
82+
$custSelectBorderColor: #ddd !default;
83+
$custSelectTriangleColor: #aaa !default;
84+
$custSelectTriangleColorOpen: #222 !default;
85+
$custSelectDropHeight: 200px !default;
86+
$custDropdownBgColor: #fff !default;
87+
$custDropdownBorderColor: darken(#fff, 20%) !default;
88+
$custDropdownFontColor: #555 !default;
89+
$custDropdownSelectedBgColor: lighten(#2ba6cb, 40%) !default;
90+
$custDropdownSelectedFontColor: #000 !default;
91+
$custFormDisabledBgColor: #ddd !default;
6092

6193
// Tab Settings
6294

6395
$tabHeight: 40px !default;
64-
$tabTermFontSize: ms(0) -2px;
96+
$tabTermFontSize: 12px;
6597

6698
// Nav Bar Settings
6799

68100
$navBarHeight: 40px !default;
69101
$navFlyoutBaseWidth: 250px !default;
70102

103+
// Top Bar Settings
104+
105+
$topBarBgColor: #222 !default;
106+
$topBarHeight: 45px !default;
107+
$topBarHeightMobile: 45px !default;
108+
$topBarBtmMargin: 30px !default;
109+
$topBarTitleWeight: bold !default;
110+
$topBarTitleSize: 17px !default;
111+
$topBarLinkColor: #fff !default;
112+
$topBarLinkWeight: bold !default;
113+
$topBarLinkSize: 13px !default;
114+
$topBarDropBgColor: #222 !default;
115+
$topBarDropLinkColor: #fff !default;
116+
$topBarDropToggleSize: 5px !default;
117+
$topBarDropToggleColor: #fff !default;
118+
$topBarDropToggleAlpha: 0.5 !default;
119+
$topBarSearchWidth: 200px !default;
120+
$topBarBreakPoint: 940px !default; // Change to 9999px for always mobile layout
121+
$topBarNavToggleSize: 8px !default;
122+
71123
// UI Settings
72124

73125
$thumbRadius: 3px !default;
74-
75126
$progBarHeight: 25px !default;
76-
$progBarBorderColor: darken($white, 20%) !default;
127+
$progBarBorderColor: darken(#fff, 20%) !default;
77128
$progBarBorderSize: 1px !default;
78129
$progBarPad: 2px !default;
79-
80-
// Off Canvas Width Settings
81-
82-
$mainWidth: 80% !default;
83-
$complementaryWidth: 20% !default;
84-
85-
// Modular Scale Settings
86-
87-
// $ratio: $golden; // THIS IS DEFAULT IN MODULAR-SCALE
88-
$baseFontSize: 14px !default;
89-
$importantModNum: 44px !default;
90-
$base-size: $baseFontSize $importantModNum;
91-
// Produced the following list of values: 14, 17, 23, 27, 37, 44, 59, 71, 95, 115;
92-
// http://www.modularscale.com by Tim Brown
93-
// https://github.com/scottkellum/modular-scale by scottkellum
130+
$linkListBottomMargin: 17px -22px !default;
131+
$tableBorderRadius: 3px !default;
94132

95133
// Tooltip Settings
134+
96135
$hasTipBorderBottom: dotted 1px #ccc !default;
97136
$hasTipFontWeight: bold !default;
98137
$hasTipFontColor: #333 !default;
99138
$hasTipBorderBottomHover: dotted 1px darken($mainColor, 20%) !default;
100139
$hasTipFontColorHover: $mainColor !default;
101140
$tooltipBackgroundColor: #000 !default;
102141
$tooltipBackgroundOpacity: 0.85 !default;
103-
$tooltipFontSize: 12 !default;
142+
$tooltipFontSize: 12px !default;
104143
$tooltipFontWeight: bold !default;
105144
$tooltipFontColor: #fff !default;
106145
$tapToCloseFontSize: 10 !default;
107146
$tapToCloseFontWeight: normal !default;
108147
$tapToCloseFontColor: #888 !default;
109-
$tooltipFontSizeScreenSmall: 14 !default;
110-
$tooltipBackgroundOpacityScreenSmall: 0.85 !default;
148+
$tooltipFontSizeScreenSm: 14 !default;
149+
$tooltipBgOpacityScreenSm: 0.85 !default;
150+
$tooltipBorderRadius: 4px !default;
151+
152+
// Pricing Table Settings
153+
154+
$priceTableBorder: solid 1px #ddd !default;
155+
$priceTitleBgColor: #ddd !default;
156+
$priceTitlePadding: 15px 20px !default;
157+
$priceTitleAlign: center !default;
158+
$priceTitleColor: #333 !default;
159+
$priceTitleWeight: bold !default;
160+
$priceTitleSize: 16px !default;
161+
162+
$priceMoneyBgColor: #eee !default;
163+
$priceMoneyPadding: 15px 20px !default;
164+
$priceMoneyAlign: center !default;
165+
$priceMoneyColor: #333 !default;
166+
$priceMoneyWeight: normal !default;
167+
$priceMoneySize: 20px !default;
168+
169+
$priceBgColor: #fff !default;
170+
$priceDescColor: #777 !default;
171+
$priceDescPadding: 15px !default;
172+
$priceDescAlign: center !default;
173+
$priceDescFontSize: 12px !default;
174+
$priceDescWeight: normal !default;
175+
$priceDescLineHeight: 1.4 !default;
176+
$priceDescBtmBorder: dotted 1px #ddd !default;
177+
178+
$priceItemColor: #333 !default;
179+
$priceItemPadding: 15px !default;
180+
$priceItemAlign: center !default;
181+
$priceItemFontSize: 14px !default;
182+
$priceItemWeight: normal !default;
183+
$priceItemBtmBorder: dotted 1px #ddd !default;
184+
185+
$priceCtaBgColor: #f5f5f5 !default;
186+
$priceCtaAlign: center !default;
187+
$priceCtaPadding: 20px !default;
188+
189+
// Orbit Settings
190+
191+
$orbitCaptionBgColorOldBrowser: #000 !default;
192+
$orbitCaptionBgColor: rgba(0,0,0,.6) !default;
193+
$orbitCaptionFontColor: #fff !default;
194+
$orbitBulletNavColor: #999 !default;
195+
$orbitBulletNavColorActive: #222 !default;
196+
$orbitHasThumbBorderColor: #000 !default;
197+
$orbitHasThumbBorderWidth: 2px !default;
198+
$orbitHasThumbBorderStyle: solid !default;
199+
$orbitSlideNumBgColor: rgba(0,0,0,0.7) !default;
200+
$orbitSlideNumFontColor: #fff !default;
201+
$orbitSlideNumPadding: 5px !default;
202+
203+
// Clearing Settings
204+
$clearingBg: rgba(0,0,0,0.8) !default;
205+
$clearingOldBrowserBg: rgb(0,0,0) !default;
206+
$clearingCaptionBg: rgba(0,0,0,0.7) !default;
207+
$clearingCaptionOldBrowserBg: rgb(0,0,0) !default;
208+
$clearingCaptionFontColor: #fff !default;
209+
$clearingCloseColor: #fff !default;
210+
$clearingArrowColor: #fff !default;
211+
$clearingArrowSize: 16px !default;
212+
$clearingCarouselOldBrowserBg: rgb(0,0,0) !default;
213+
$clearingCarouselBg: rgba(0,0,0,0.75) !default;
214+
$clearingCarouselHeight: 150px !default;
215+
$clearingCarouselThumbHeight: 150px !default;
216+
$clearingCarouselThumbWidth: 175px !default;
217+
$clearingCarouselThumbActiveBorder: 4px solid rgb(255,255,255) !default;
218+
$clearingImgOldBrowserBg: rgb(0,0,0) !default;
219+
$clearingImgBg: rgba(0,0,0,0.75) !default;
111220

112-
// Top Bar Settings
221+
// Off Canvas Width Settings
113222

114-
$topBarBgColor: #222 !default;
115-
$topBarHeight: 45px !default;
116-
$topBarBtmMargin: 30px !default;
117-
$topBarTitleWeight: bold !default;
118-
$topBarTitleSize: ms(1) !default;
119-
$topBarLinkColor: #fff !default;
120-
$topBarLinkWeight: bold !default;
121-
$topBarLinkSize: ms(0) - 1 !default;
122-
$topBarDropToggleSize: 5px !default;
123-
$topBarDropToggleColor: #fff !default;
124-
$topBarDropToggleAlpha: 0.5 !default;
125-
$topBarSearchWidth: 200px !default;
126-
$topBarBreakPoint: 940px !default; // Change to 9999px for always mobile layout
127-
$topBarNavToggleSize: 8px !default;
223+
$mainWidth: 80% !default;
224+
$complementaryWidth: 20% !default;
225+
226+
// Modular Scale Settings
128227

129-
// UI Link Lists
130-
$linkListBottomMargin: ms(1) -22px;
228+
// $ratio: $golden; // THIS IS DEFAULT IN MODULAR-SCALE
229+
$baseFontSize: 14px !default;
230+
$importantModNum: 44px !default;
231+
$base-size: $baseFontSize $importantModNum;
232+
// Produced the following list of values: 14, 17, 23, 27, 37, 44, 59, 71, 95, 115;
233+
// http://www.modularscale.com by Tim Brown
234+
// https://github.com/scottkellum/modular-scale by scottkellum
131235

132236
// Media Queries
133237

0 commit comments

Comments
 (0)