Skip to content

Commit

Permalink
Merge pull request #7017 from zurb/v6
Browse files Browse the repository at this point in the history
Merge Foundation 6
  • Loading branch information
gakimball committed Nov 19, 2015
2 parents 202c317 + 46d679d commit 1e08494
Show file tree
Hide file tree
Showing 958 changed files with 54,337 additions and 69,773 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

14 changes: 7 additions & 7 deletions .gitignore
Expand Up @@ -14,11 +14,12 @@
.idea
.sass-cache/*
.yardoc
_build

bower_components
dist
bundle
build/*
/docs2/public/*
vendor
_yardoc
coverage
docs/public/*
Expand All @@ -29,11 +30,9 @@ node_modules
pkg
rdoc
spec/reports
npm-debug.log
_debug.json

test/
test/.sass-cache/*
test/css
test/css/styles.css
*.orig
node_modules
docs/public/*
Expand All @@ -47,8 +46,9 @@ test/scss/output-test
test/tmp
test/version_tmp
tmp

testing/_build

pizza/
data.json
docs/*
npm-debug.log
8 changes: 8 additions & 0 deletions .npmignore
@@ -0,0 +1,8 @@
.sass-cache
_build
bower_components
config
docs
gulp
lib
spec
38 changes: 0 additions & 38 deletions .travis.yml

This file was deleted.

4 changes: 0 additions & 4 deletions Gemfile

This file was deleted.

29 changes: 0 additions & 29 deletions Gemfile.lock

This file was deleted.

37 changes: 0 additions & 37 deletions Gruntfile.js

This file was deleted.

37 changes: 21 additions & 16 deletions README.md
@@ -1,46 +1,51 @@
# [Foundation](http://foundation.zurb.com)
# [Foundation for Sites](http://foundation.zurb.com) (v6.0)

[![Build Status](https://travis-ci.org/zurb/foundation.svg)](https://travis-ci.org/zurb/foundation)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/zurb/foundation-sites?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

Foundation is the most advanced responsive front-end framework in the world. Quickly go from prototype to production, building sites or apps that work on any kind of device with Foundation. Includes layout constructs, like a fully customizable, responsive grid, commonly used JavaScript plugins, and full A11Y support.

Foundation is the most advanced responsive front-end framework in the world. You can quickly prototype and build sites or apps that work on any kind of device with Foundation, which includes layout constructs (like a fully responsive grid), elements and best practices.
## Requirements

To get started, check out <http://foundation.zurb.com/docs>
Requires NodeJS to be installed on your machine. Works with 0.10, 0.12, and 4.1! **Note that parts of our build process will break with NPM 3, due to the changes in how packages are installed.**

The Sass is compiled using libsass, which requires the GCC to be installed on your machine. Windows users can install it through [MinGW](http://www.mingw.org/), and Mac users can install it through the [Xcode Command-line Tools](http://osxdaily.com/2014/02/12/install-command-line-tools-mac-os-x/).

## Quickstart
## Setup

To get going with Foundation you can:

* [Download the latest release](http://foundation.zurb.com/develop/download.html)
* [Install with Bower](http://bower.io): `bower install foundation`

* [Install Yeti Launch](http://foundation.zurb.com/develop/yeti-launch.html): Seriously though, check it out!
* [Install the CLI](https://www.npmjs.com/package/foundation-cli): `npm install -g foundation-cli`
* [Download the latest release](http://foundation.zurb.com/sites/download.html)
* [Install with Bower](http://bower.io): `bower install foundation-sites`
* [Install with npm](http://npmjs.com): `npm install foundation-sites`
* [Install with Atmosphere for Meteor](https://atmospherejs.com): `meteor add zurb:foundation-sites`
* [Install with Composer](https://getcomposer.org/): `php composer.phar require zurb/foundation-sites`

## Documentation

Foundation uses [Assemble.io](http://assemble.io) and [Grunt](http://gruntjs.com/) to generate its [documentation pages](http://foundation.zurb.com/docs). Documentation can also be run from your local computer:
Foundation uses [Gulp](http://gulpjs.com/) and [SuperCollider](https://www.npmjs.com/package/supercollider) to generate its [documentation pages](http://foundation.zurb.com/sites/docs). Documentation can also be run from your local computer:

### View documentation locally

You'll want to clone the Foundation repo first and install all the dependencies. You can do this using the following commands:

```
git clone git@github.com:zurb/foundation.git
cd foundation
npm install -g grunt-cli bower
git clone git@github.com:zurb/foundation-sites.git
cd foundation-sites
npm install
bower install
bundle install
```

Then just run `grunt build` and the documentation will be compiled:
Then just run `npm start` and the documentation will be compiled. It will also launch an instance of [BrowserSync](http://www.browsersync.io/) and open a tab in your default browser.
The file structure:

```
foundation/
├── dist/
│ └── ...
├────── docs/
└── ...
├── docs/
│ └── ...
```

Copyright (c) 2015 ZURB, inc.
19 changes: 8 additions & 11 deletions bower.json
@@ -1,21 +1,18 @@
{
"name": "foundation",
"name": "foundation-sites",
"version": "6.0.0-rc.1",
"main": [
"scss/foundation.scss",
"js/foundation.js"
],
"ignore": [
"config",
"docs",
"lib",
"spec"
],
"dependencies": {
"jquery": ">= 2.1.0",
"modernizr": "2.8.3",
"fastclick": ">=0.6.11",
"jquery.cookie": "~1.4.0",
"jquery-placeholder": "~2.0.7"
},
"devDependencies": {
"jquery.autocomplete": "devbridge/jQuery-Autocomplete#1.2.9",
"lodash": "~2.4.1"
},
"private": true
"what-input": "~1.1.2"
}
}
36 changes: 26 additions & 10 deletions composer.json
@@ -1,12 +1,28 @@
{
"name": "zurb/foundation",
"description": "The most advanced responsive front-end framework in the world.",
"keywords": ["foundation", "scss"],
"homepage": "http://foundation.zurb.com",
"authors": [
{
"name": "ZURB Inc."
}
],
"license": "MIT"
"name": "zurb/foundation-sites",
"description": "The most advanced responsive front-end framework in the world.",
"version": "6.0.0",
"keywords": [
"css",
"scss",
"sass",
"js",
"responsive",
"mobile-first",
"framework"
],
"homepage": "http://foundation.zurb.com",
"authors": [
{
"name": "ZURB, Inc.",
"homepage": "http://zurb.com",
"email": "foundation@zurb.com"
}
],
"support": {
"email": "foundation@zurb.com",
"issues": "https://github.com/zurb/foundation-sites/issues",
"forum": "http://foundation.zurb.com/forum"
},
"license": "MIT"
}
15 changes: 15 additions & 0 deletions config/.jshintConfig
@@ -0,0 +1,15 @@
{
"boss": true,
"node": true,
"strict": true,
"newcap": false,
"undef": true,
"unused": false,
"onecase": true,
"lastsemic": true,
"expr": true,
"eqeqeq": true,
"jquery": true,
"browser": true,
"predef": ["Foundation", "define"]
}
63 changes: 63 additions & 0 deletions config/karma.conf.js
@@ -0,0 +1,63 @@
// Karma configuration
module.exports = function(config) {
config.set({

// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '..',


// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['jasmine'],


// list of files / patterns to load in the browser
files: [
'test/js/**/*.js'
],


// list of files to exclude
exclude: [
],


// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
},


// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],


// web server port
port: 9876,


// enable / disable colors in the output (reporters and logs)
colors: true,


// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,


// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,


// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Chrome', 'Firefox', 'Safari', 'Opera', 'IE'],


// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false
})
}

0 comments on commit 1e08494

Please sign in to comment.