Skip to content

Commit

Permalink
Update to Bootstrap 4.0.0-alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
RobLoach committed Aug 21, 2015
1 parent d71c2a2 commit c9521fb
Show file tree
Hide file tree
Showing 114 changed files with 11,073 additions and 18,245 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
build
vendor
components
bower_components
jam
node_modules
composer.lock
12 changes: 6 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "components-bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "http://getbootstrap.com",
"version": "3.3.5",
"keywords": [
"css",
"less",
Expand All @@ -14,12 +13,13 @@
],
"license": "MIT",
"dependencies": {
"jquery": ">=1.9.1"
"jquery": "~2"
},
"main": "js/bootstrap.js",
"main": [
"js/bootstrap.js",
"css/bootstrap.css"
],
"ignore": [
"component.json",
"package.json",
"composer.json"
"*.json"
]
}
91 changes: 4 additions & 87 deletions component.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"repo": "components/bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "http://getbootstrap.com",
"version": "3.3.5",
"version": "4.0.0-alpha",
"keywords": [
"css",
"less",
Expand All @@ -15,96 +15,13 @@
],
"license": "MIT",
"dependencies": {
"components/jquery": ">=1.9.1"
"components/jquery": "*"
},
"main": "js/bootstrap.js",
"scripts": [
"js/bootstrap.js"
],
"files": [
"css/bootstrap.min.css",
"css/bootstrap-theme.min.css",
"css/bootstrap.css.map",
"css/bootstrap-theme.css.map"
],
"fonts": [
"fonts/glyphicons-halflings-regular.eot",
"fonts/glyphicons-halflings-regular.svg",
"fonts/glyphicons-halflings-regular.ttf",
"fonts/glyphicons-halflings-regular.woff",
"fonts/glyphicons-halflings-regular.woff2"
],
"less": [
"less/mixins/alerts.less",
"less/mixins/background-variant.less",
"less/mixins/border-radius.less",
"less/mixins/buttons.less",
"less/mixins/center-block.less",
"less/mixins/clearfix.less",
"less/mixins/forms.less",
"less/mixins/gradients.less",
"less/mixins/grid-framework.less",
"less/mixins/grid.less",
"less/mixins/hide-text.less",
"less/mixins/image.less",
"less/mixins/labels.less",
"less/mixins/list-group.less",
"less/mixins/nav-divider.less",
"less/mixins/nav-vertical-align.less",
"less/mixins/opacity.less",
"less/mixins/pagination.less",
"less/mixins/panels.less",
"less/mixins/progress-bar.less",
"less/mixins/reset-filter.less",
"less/mixins/reset-text.less",
"less/mixins/resize.less",
"less/mixins/responsive-visibility.less",
"less/mixins/size.less",
"less/mixins/tab-focus.less",
"less/mixins/table-row.less",
"less/mixins/text-emphasis.less",
"less/mixins/text-overflow.less",
"less/mixins/vendor-prefixes.less",
"less/alerts.less",
"less/badges.less",
"less/bootstrap.less",
"less/breadcrumbs.less",
"less/button-groups.less",
"less/buttons.less",
"less/carousel.less",
"less/close.less",
"less/code.less",
"less/component-animations.less",
"less/dropdowns.less",
"less/forms.less",
"less/glyphicons.less",
"less/grid.less",
"less/input-groups.less",
"less/jumbotron.less",
"less/labels.less",
"less/list-group.less",
"less/media.less",
"less/mixins.less",
"less/modals.less",
"less/navbar.less",
"less/navs.less",
"less/normalize.less",
"less/pager.less",
"less/pagination.less",
"less/panels.less",
"less/popovers.less",
"less/print.less",
"less/progress-bars.less",
"less/responsive-embed.less",
"less/responsive-utilities.less",
"less/scaffolding.less",
"less/tables.less",
"less/theme.less",
"less/thumbnails.less",
"less/tooltip.less",
"less/type.less",
"less/utilities.less",
"less/variables.less",
"less/wells.less"
"styles": [
"css/bootstrap.css"
]
}
10 changes: 2 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
}
],
"require": {
"components/jquery": ">=1.9.1 <3.0"
},
"suggest": {
"components/bootstrap-default": "Provide a theme for Bootstrap as components/bootstrap only provides the CSS as file assets"
"components/jquery": "<3.0"
},
"extra": {
"component": {
Expand All @@ -37,10 +34,7 @@
"files": [
"js/*.js",
"css/*.css",
"css/*.map",
"fonts/*",
"less/mixins/*.less",
"less/*.less"
"css/*.map"
],
"shim": {
"deps": ["jquery"]
Expand Down
Loading

0 comments on commit c9521fb

Please sign in to comment.