Skip to content

Commit

Permalink
Merge pull request #26 from Raphy/master
Browse files Browse the repository at this point in the history
Upgrade to 6.0.4
  • Loading branch information
martinlindhe committed Nov 25, 2015
2 parents 035e438 + 0a001d8 commit 93cd82a
Show file tree
Hide file tree
Showing 137 changed files with 16,582 additions and 29,045 deletions.
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "foundation",
"version": "5.5.2",
"version": "6.0.4",
"main": [
"css/foundation.css",
"css/foundation.css.map",
"js/foundation.js"
],
"ignore": [
Expand Down
107 changes: 65 additions & 42 deletions component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "foundation",
"repo": "components/foundation",
"version": "5.5.2",
"version": "6.0.4",
"dependencies": {
"components/modernizr": "*",
"components/jquery": "*",
Expand All @@ -15,48 +15,71 @@
"css/foundation.css"
],
"files": [
"scss/normalize.scss",
"scss/typography/_alignment.scss",
"scss/typography/_helpers.scss",
"scss/typography/_print.scss",
"scss/typography/_typography.scss",
"scss/typography/_base.scss",
"scss/components/_breadcrumbs.scss",
"scss/components/_dropdown.scss",
"scss/components/_tooltip.scss",
"scss/components/_menu.scss",
"scss/components/_badge.scss",
"scss/components/_top-bar.scss",
"scss/components/_callout.scss",
"scss/components/_visibility.scss",
"scss/components/_flex-video.scss",
"scss/components/_switch.scss",
"scss/components/_orbit.scss",
"scss/components/_label.scss",
"scss/components/_thumbnail.scss",
"scss/components/_media-object.scss",
"scss/components/_button.scss",
"scss/components/_accordion.scss",
"scss/components/_reveal.scss",
"scss/components/_progress-bar.scss",
"scss/components/_table.scss",
"scss/components/_off-canvas.scss",
"scss/components/_button-group.scss",
"scss/components/_drilldown.scss",
"scss/components/_close-button.scss",
"scss/components/_slider.scss",
"scss/components/_title-bar.scss",
"scss/components/_dropdown-menu.scss",
"scss/components/_sticky.scss",
"scss/components/_tabs.scss",
"scss/components/_accordion-menu.scss",
"scss/components/_pagination.scss",
"scss/components/_float.scss",
"scss/grid/_column.scss",
"scss/grid/_layout.scss",
"scss/grid/_flex-grid.scss",
"scss/grid/_row.scss",
"scss/grid/_grid.scss",
"scss/grid/_classes.scss",
"scss/grid/_position.scss",
"scss/grid/_gutter.scss",
"scss/grid/_size.scss",
"scss/forms/_error.scss",
"scss/forms/_input-group.scss",
"scss/forms/_label.scss",
"scss/forms/_checkbox.scss",
"scss/forms/_fieldset.scss",
"scss/forms/_text.scss",
"scss/forms/_forms.scss",
"scss/forms/_select.scss",
"scss/forms/_help-text.scss",
"scss/util/_selector.scss",
"scss/util/_breakpoint.scss",
"scss/util/_value.scss",
"scss/util/_util.scss",
"scss/util/_mixins.scss",
"scss/util/_color.scss",
"scss/util/_unit.scss",
"scss/foundation.scss",
"scss/foundation/_functions.scss",
"scss/foundation/_settings.scss",
"scss/foundation/components/_accordion.scss",
"scss/foundation/components/_alert-boxes.scss",
"scss/foundation/components/_block-grid.scss",
"scss/foundation/components/_breadcrumbs.scss",
"scss/foundation/components/_button-groups.scss",
"scss/foundation/components/_buttons.scss",
"scss/foundation/components/_clearing.scss",
"scss/foundation/components/_dropdown-buttons.scss",
"scss/foundation/components/_dropdown.scss",
"scss/foundation/components/_flex-video.scss",
"scss/foundation/components/_forms.scss",
"scss/foundation/components/_global.scss",
"scss/foundation/components/_grid.scss",
"scss/foundation/components/_icon-bar.scss",
"scss/foundation/components/_inline-lists.scss",
"scss/foundation/components/_joyride.scss",
"scss/foundation/components/_keystrokes.scss",
"scss/foundation/components/_labels.scss",
"scss/foundation/components/_magellan.scss",
"scss/foundation/components/_offcanvas.scss",
"scss/foundation/components/_orbit.scss",
"scss/foundation/components/_pagination.scss",
"scss/foundation/components/_panels.scss",
"scss/foundation/components/_pricing-tables.scss",
"scss/foundation/components/_progress-bars.scss",
"scss/foundation/components/_range-slider.scss",
"scss/foundation/components/_reveal.scss",
"scss/foundation/components/_side-nav.scss",
"scss/foundation/components/_split-buttons.scss",
"scss/foundation/components/_sub-nav.scss",
"scss/foundation/components/_switches.scss",
"scss/foundation/components/_tables.scss",
"scss/foundation/components/_tabs.scss",
"scss/foundation/components/_thumbs.scss",
"scss/foundation/components/_tooltips.scss",
"scss/foundation/components/_top-bar.scss",
"scss/foundation/components/_type.scss",
"scss/foundation/components/_visibility.scss"
"scss/settings/_settings.scss",
"scss/vendor/normalize.scss",
"scss/_global.scss"
],
"license": "MIT"
}
Loading

0 comments on commit 93cd82a

Please sign in to comment.