Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add bootstrap@4.0.0.alpha.4 compatibility #167

Merged
merged 3 commits into from
Sep 10, 2016
Merged

Add bootstrap@4.0.0.alpha.4 compatibility #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e040676
Add bootstrap@4.0.0-alpha.4 compatibility
rmobis Sep 8, 2016
c2127da
Update examples for bootstrap@4.0.0-alpha.4 compatibility
rmobis Sep 8, 2016
23ae518
Fix local installation on examples
rmobis Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .bootstraprc-4-default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,14 @@ styles:
card: true
breadcrumb: true
pagination: true
pager: true
labels: true
jumbotron: true
alert: true
progress: true
media: true
list-group: true
responsive-embed: true
close: true
tags: true

# Components w/ JavaScript
modal: true
Expand All @@ -97,9 +96,6 @@ styles:

# Utility classes
utilities: true
utilities-background: true
utilities-spacing: true
utilities-responsive: true

### Bootstrap scripts
scripts:
Expand Down
5 changes: 1 addition & 4 deletions examples/basic/.bootstraprc-4-example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,14 @@ styles:
card: true
breadcrumb: true
pagination: true
pager: true
labels: true
jumbotron: true
alert: true
progress: true
media: true
list-group: true
responsive-embed: true
close: true
tags: true

# Components w/ JavaScript
modal: true
Expand All @@ -106,8 +105,6 @@ styles:

# Utility classes
utilities: true
utilities-spacing: true
utilities-responsive: true

### Bootstrap scripts
scripts:
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"license": "MIT",
"dependencies": {
"express": "^4.13.3",
"bootstrap": "4.0.0-alpha.2",
"bootstrap": "4.0.0-alpha.4",
"bootstrap-sass": "^3.3.6",
"font-awesome": "^4.6.3",
"jquery": "^2.1.4",
Expand Down
5 changes: 1 addition & 4 deletions examples/css-modules/.bootstraprc-4-example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,14 @@ styles:
card: true
breadcrumb: true
pagination: true
pager: true
labels: true
jumbotron: true
alert: true
progress: true
media: true
list-group: true
responsive-embed: true
close: true
tags: true

# Components w/ JavaScript
modal: true
Expand All @@ -87,8 +86,6 @@ styles:

# Utility classes
utilities: true
utilities-spacing: true
utilities-responsive: true

### Bootstrap scripts
scripts: false
2 changes: 1 addition & 1 deletion examples/css-modules/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
"dependencies": {
"body-parser": "^1.15.0",
"bootstrap": "4.0.0-alpha.2",
"bootstrap": "4.0.0-alpha.4",
"bootstrap-sass": "^3.3.6",
"express": "^4.13.4",
"font-awesome": "^4.6.3",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/createBootstrapRequire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function(module, bootstrapVersion, bootstrapPath) {
const scriptsPath = (
parseInt(bootstrapVersion, 10) === 3 ?
['assets', 'javascripts', 'bootstrap'] :
['dist', 'js', 'umd']
['js', 'dist']
);
const bootstrapModule = path.join(bootstrapPath, ...scriptsPath, module);
return `require (${JSON.stringify(bootstrapModule)});`;
Expand Down