]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Resolve merge conflicts
authorGeoff Kimball <geoff@zurb.com>
Thu, 19 Nov 2015 02:14:42 +0000 (18:14 -0800)
committerGeoff Kimball <geoff@zurb.com>
Thu, 19 Nov 2015 02:14:42 +0000 (18:14 -0800)
151 files changed:
1  2 
.gitignore
README.md
bower.json
docs_old/includes/abide/examples_abide_basic.html
docs_old/includes/abide/examples_abide_javascript_options.html
docs_old/includes/accordion/examples_accordion_basic_rendered.html
docs_old/includes/accordion/examples_accordion_variables.html
docs_old/includes/alert/examples_alert_aria.html
docs_old/includes/alert/examples_alert_aria_rendered.html
docs_old/includes/buttons/examples_buttons_custom_mixin.html
docs_old/includes/dropdown/examples_dropdown_advanced.html
docs_old/includes/dropdown/examples_dropdown_autoclose.html
docs_old/includes/dropdown/examples_dropdown_basic.html
docs_old/includes/dropdown/examples_dropdown_directions.html
docs_old/includes/dropdown_buttons/examples_dropdown_button_basic.html
docs_old/includes/dropdown_buttons/examples_dropdown_button_basic_rendered.html
docs_old/includes/dropdown_buttons/examples_dropdown_button_intro.html
docs_old/includes/examples_global_rendered.html
docs_old/includes/examples_javascript_data_options.html
docs_old/includes/footer.html
docs_old/includes/form/examples_form_fieldset.html
docs_old/includes/form/examples_form_variables.html
docs_old/includes/foundation-intro-banner.html
docs_old/includes/grid/examples_grid_rendered.html
docs_old/includes/grid/examples_grid_row_collapse_rendered.html
docs_old/includes/icon-bar/examples_icon_bar_rendered.html
docs_old/includes/icon-bar/examples_icon_bar_text_aria_rendered.html
docs_old/includes/magellan/examples_magellan_destination.html
docs_old/includes/off_canvas/examples_offcanvas_multiple_rendered.html
docs_old/includes/off_canvas/examples_offcanvas_variables.html
docs_old/includes/offcanvas-nav.html
docs_old/includes/panels/examples_panels_variables.html
docs_old/includes/range_sliders/examples_slider_variables.html
docs_old/includes/reveal/examples_reveal_basic.html
docs_old/includes/reveal/examples_reveal_basic_rendered.html
docs_old/includes/reveal/examples_reveal_javascript_options.html
docs_old/includes/reveal/examples_reveal_modal_examples.html
docs_old/includes/reveal/examples_reveal_modal_examples_rendered.html
docs_old/includes/sidebar.html
docs_old/includes/split_button/examples_split_button_variables.html
docs_old/includes/subnav/examples_subnav_accessible_rendered.html
docs_old/includes/subnav/examples_subnav_basic.html
docs_old/includes/tables/examples_tables_basic.html
docs_old/includes/tabs/examples_tabs_accessibility.html
docs_old/includes/topbar.html
docs_old/includes/topbar/examples_topbar_variables.html
docs_old/layouts/default.html
docs_old/layouts/kitchen.html
docs_old/pages/accessibility.html
docs_old/pages/changelog.html
docs_old/pages/components/abide.html
docs_old/pages/components/accordion.html
docs_old/pages/components/alert_boxes.html
docs_old/pages/components/block_grid.html
docs_old/pages/components/breadcrumbs.html
docs_old/pages/components/button_groups.html
docs_old/pages/components/buttons.html
docs_old/pages/components/clearing.html
docs_old/pages/components/dropdown.html
docs_old/pages/components/dropdown_buttons.html
docs_old/pages/components/equalizer.html
docs_old/pages/components/flex_video.html
docs_old/pages/components/forms.html
docs_old/pages/components/global.html
docs_old/pages/components/grid.html
docs_old/pages/components/icon-bar.html
docs_old/pages/components/inline_lists.html
docs_old/pages/components/interchange-large.html
docs_old/pages/components/interchange.html
docs_old/pages/components/joyride.html
docs_old/pages/components/keystrokes.html
docs_old/pages/components/labels.html
docs_old/pages/components/magellan.html
docs_old/pages/components/offcanvas.html
docs_old/pages/components/orbit.html
docs_old/pages/components/pagination.html
docs_old/pages/components/panels.html
docs_old/pages/components/pricing_tables.html
docs_old/pages/components/progress_bars.html
docs_old/pages/components/range_slider.html
docs_old/pages/components/reveal.html
docs_old/pages/components/rtl.html
docs_old/pages/components/sidenav.html
docs_old/pages/components/split_buttons.html
docs_old/pages/components/subnav.html
docs_old/pages/components/support.html
docs_old/pages/components/switch.html
docs_old/pages/components/tables.html
docs_old/pages/components/tabs.html
docs_old/pages/components/thumbnails.html
docs_old/pages/components/tooltips.html
docs_old/pages/components/topbar.html
docs_old/pages/components/typography.html
docs_old/pages/components/visibility.html
docs_old/pages/css.html
docs_old/pages/index.html
docs_old/pages/javascript-utilities.html
docs_old/pages/media-queries.html
docs_old/pages/sass-files.html
docs_old/pages/sass.html
js/foundation/foundation.interchange.js
package.json
scss/components_old/_accordion.scss
scss/components_old/_alert-boxes.scss
scss/components_old/_block-grid.scss
scss/components_old/_breadcrumbs.scss
scss/components_old/_button-groups.scss
scss/components_old/_buttons.scss
scss/components_old/_clearing.scss
scss/components_old/_dropdown-buttons.scss
scss/components_old/_dropdown.scss
scss/components_old/_flex-video.scss
scss/components_old/_forms.scss
scss/components_old/_global.scss
scss/components_old/_icon-bar.scss
scss/components_old/_inline-lists.scss
scss/components_old/_joyride.scss
scss/components_old/_keystrokes.scss
scss/components_old/_labels.scss
scss/components_old/_magellan.scss
scss/components_old/_offcanvas.scss
scss/components_old/_orbit.scss
scss/components_old/_pagination.scss
scss/components_old/_panels.scss
scss/components_old/_pricing-tables.scss
scss/components_old/_progress-bars.scss
scss/components_old/_range-slider.scss
scss/components_old/_reveal.scss
scss/components_old/_side-nav.scss
scss/components_old/_split-buttons.scss
scss/components_old/_sub-nav.scss
scss/components_old/_switches.scss
scss/components_old/_tables.scss
scss/components_old/_tabs.scss
scss/components_old/_thumbs.scss
scss/components_old/_tooltips.scss
scss/components_old/_top-bar.scss
scss/components_old/_type.scss
scss/components_old/_visibility.scss
scss/vendor/normalize.scss
spec/foundation/abide/abide.js
spec/foundation/abide/basic.html
spec/foundation/clearing/basic.html
spec/foundation/clearing/clearing.js
spec/foundation/dropdown/basic.html
spec/foundation/dropdown/dropdown.js
spec/foundation/equalizer/equalizer.js
spec/foundation/interchange/interchange.js
spec/foundation/reveal/reveal.js
spec/foundation/tab/tab.js
spec/foundation/tooltip/tooltip.js

diff --cc .gitignore
index fd3f82847344225a4f7f6611344ad4a45232fadd,e08d875a85244035c5822ae73e8c75eb9b3061cf..a11a0784bae7b393aa73f69de57f1fd40ee23364
@@@ -44,7 -47,8 +46,9 @@@ test/scss/output-tes
  test/tmp
  test/version_tmp
  tmp
 -
 +testing/_build
  
  pizza/
- data.json
++data.json
+ docs/*
+ npm-debug.log
diff --cc README.md
index 81b5094b29958dfd9995b3de2b83c22bcf38ad37,d5ef5fc6a53da11f9e0f2c7df4b68d560da2f3bb..8b191760d80bb6d8c805a2b9b0d645f099466533
+++ b/README.md
@@@ -1,51 -1,46 +1,48 @@@
 -# [Foundation](http://foundation.zurb.com)
 +# [Foundation for Sites](http://foundation.zurb.com) (Public Beta)
  
 -[![Build Status](https://travis-ci.org/zurb/foundation.svg)](https://travis-ci.org/zurb/foundation)
 +This is the in-development version of Foundation for Sites 6.0. 
  
 +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/zurb/foundation-sites-6?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
  
 -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
  
- ```bash
- git clone https://github.com/zurb/foundation-sites-6.git
- cd foundation-sites-6
+ 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 with npm](http://npmjs.com): `npm install 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:
+ ### 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
  npm install
- npm start
+ bower install
+ bundle install
+ ```
+ Then just run `grunt build` and the documentation will be compiled:
+ ```
+ foundation/
+ â”œâ”€â”€ dist/
+ â”‚   â””── ...
+ â”œâ”€â”€â”€â”€â”€â”€ docs/
+ â”‚       â””── ...
  ```
  
- ## Local Testing
- `npm start` will compile the documentation. For this testing period, we've created a small testbed to experiment with components. You can find the assets under the `testing/` folder. To use the testbed, run `npm run testbed` after installing the needed dependencies.
- ## Folder structure
- - `_build/`: compiled HTML, CSS, and JavaScript. *Don't edit these files directly, as they will be overwritten!*
- - `config/`: configuration files for our linters.
- - `dist/`: compiled CSS and JavaScript files for the current release.
- - `docs/`: documentation source.
-   - `layouts/default.html`: base HTML template for every docs page.
-   - `layouts/component.html`: Handlebars template for component documentation.
-   - `pages/*.html`: basic documentation pages.
-   - `pages/*.md`: fancy documentation pages for components, which are parsed through [Supercollider](https://github.com/gakimball/supercollider).
-   - `partials/`: Handlebars partials go here.
-   - `assets/`: docs-specific images, styles, and scripts go here.
- - `js/`: the Foundation 5 JavaScript.
-   - New components are inside this folder.
-   - Old components are in `js/foundation/`.
- - `scss/`: the Sass.
-   - `scss/components`: new UI components go here.
-   - `scss/components_old`: Foundation 5 components stay here.
-   - `scss/forms`: form styles.
-   - `scss/grid`: the new grid.
-   - `scss/typography`: typography.
-   - `scss/util`: helper functions and mixins.
-   - `scss/vendor`: third-party libraries.
-   - `_global.scss`: global variables and styles.
- - `docs_old/`: Foundation 5 documentation.
- - `spec/`: Foundation 5 unit tests.
+ Copyright (c) 2015 ZURB, inc.
diff --cc bower.json
index 4a2929969c6f941b5c6a8f28863d851c988c77f2,8586aa681d05568e2a66318678e9c6d9838c0785..472e0f01ea82976ff48e5e39213d3bb08f10e48a
@@@ -1,9 -1,7 +1,8 @@@
  {
 -  "name": "foundation",
 +  "name": "foundation-sites",
-   "version": "6.0.0-alpha.1",
++  "version": "6.0.0-rc.1",
    "main": [
-     "css/foundation.css",
-     "css/foundation.css.map",
+     "scss/foundation.scss",
      "js/foundation.js"
    ],
    "ignore": [
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc package.json
index 3084270d7637fbfd96ab869ccc993cd7db162f4f,70e24c915cc0eef255934cea3658a05bbc09c8a1..077bd21797d2b9b3c87c4902846de9bad49430e2
@@@ -1,56 -1,44 +1,98 @@@
  {
    "name": "foundation-sites",
++<<<<<<< HEAD
 +  "version": "6.0.0-alpha.2",
 +  "main": "js/foundation/foundation.js",
 +  "scripts": {
 +    "start": "gulp",
 +    "test": "gulp test",
 +    "testbed": "cd testing && gulp",
 +    "deploy": "gulp deploy:docs"
 +  },
 +  "dependencies": {
 +    "jquery": "^2.1.0",
 +    "what-input": "^1.1.2"
 +  },
 +  "devDependencies": {
 +    "bootcamp": "^1.1.7",
 +    "browser-sync": "^2.8.2",
 +    "gulp": "^3.8.10",
 +    "gulp-autoprefixer": "^2.3.1",
 +    "gulp-cached": "^1.0.4",
 +    "gulp-concat": "^2.4.3",
 +    "gulp-filter": "^2.0.2",
 +    "gulp-jshint": "^1.9.2",
 +    "gulp-load-plugins": "^0.8.0",
 +    "gulp-minify-css": "^1.2.1",
 +    "gulp-plumber": "^1.0.1",
 +    "gulp-prompt": "^0.1.2",
 +    "gulp-rename": "^1.2.2",
 +    "gulp-rsync": "0.0.5",
 +    "gulp-ruby-sass": "^1.0.0-alpha.3",
 +    "gulp-sass": "^2.1.0",
 +    "gulp-scss-lint": "^0.2.2",
 +    "gulp-uglify": "^1.1.0",
 +    "handlebars": "^3.0.1",
 +    "highlight.js": "^8.5.0",
 +    "marked": "^0.3.3",
 +    "mocha": "^2.3.3",
 +    "motion-ui": "^1.1.0",
 +    "multiline": "^1.0.2",
 +    "octophant": "^1.0.0",
 +    "open": "0.0.5",
 +    "opener": "^1.4.1",
 +    "panini": "^1.0.0",
 +    "parker": "0.0.9",
 +    "pretty-print": "^1.0.0",
 +    "prettyjson": "^1.1.3",
 +    "require-dir": "^0.3.0",
 +    "rimraf": "^2.3.2",
 +    "run-sequence": "^1.1.4",
 +    "string-template": "^0.2.1",
 +    "supercollider": "^1.0.0",
 +    "typeahead.js": "^0.11.1",
 +    "zeroclipboard": "^2.2.0"
++=======
+   "version": "5.5.3",
+   "main": "js/foundation/foundation.js",
+   "scripts": {
+     "start": "grunt"
+   },
+   "devDependencies": {
+     "assemble": "~0.4.37",
+     "grunt": "~0.4.4",
+     "grunt-cli": "^0.1.13",
+     "grunt-contrib-clean": "~0.5.0",
+     "grunt-contrib-compress": "~0.7.0",
+     "grunt-contrib-concat": "~0.3.0",
+     "grunt-contrib-connect": "~0.7.1",
+     "grunt-contrib-copy": "~0.5.0",
+     "grunt-contrib-cssmin": "^0.12.2",
+     "grunt-contrib-jasmine": "~0.6.3",
+     "grunt-contrib-jst": "~0.5.1",
+     "grunt-contrib-sass": "~0.8.1",
+     "grunt-contrib-uglify": "~0.4.0",
+     "grunt-contrib-watch": "~0.6.1",
+     "grunt-karma": "~0.6.2",
+     "grunt-newer": "~0.7.0",
+     "grunt-rsync": "~0.2.1",
+     "grunt-string-replace": "~0.2.7",
+     "handlebars-helper-rel": "~0.1.2",
+     "handlebars-helper-slugify": "~0.2.0",
+     "highlight.js": "~7.3.0",
+     "jasmine-jquery": "imtapps/node-jasmine-jquery",
+     "karma": "~0.10.4",
+     "karma-browserstack-launcher": "0.0.4",
+     "karma-chrome-launcher": "~0.1.0",
+     "karma-firefox-launcher": "~0.1.0",
+     "karma-html2js-preprocessor": "~0.1.0",
+     "karma-ie-launcher": "~0.1.1",
+     "karma-jasmine": "~0.1.3",
+     "karma-phantomjs-launcher": "~0.1.0",
+     "karma-safari-launcher": "~0.1.1",
+     "karma-script-launcher": "~0.1.0",
+     "load-grunt-config": "~0.16.0"
++>>>>>>> master
    },
    "repository": {
      "type": "git",
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a3e4fa8ad37939b0ca83a3be3076a16ffa30b498,a3140c8b3a7a5dc2268317e42e0642691952cd47..f981933d0f723af875d8fa63c8a3202f1171d0a7
@@@ -2,7 -2,7 +2,11 @@@
  // foundation.zurb.com
  // Licensed under MIT Open Source
  
++<<<<<<< HEAD:scss/components_old/_global.scss
 +@import "helpers/functions";
++=======
+ @import '../functions';
++>>>>>>> master:scss/foundation/components/_global.scss
  //
  // Foundation Variables
  //
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 8c8653203927450dc447f4608273933360cf8c86,d02d4f4f03c5f3005dba7b55874dbfd9848b4a39..d02d4f4f03c5f3005dba7b55874dbfd9848b4a39
mode 100644,100755..100755
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge