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

Fixed partials ordering and added missing responsive-embed one #18

Merged
merged 3 commits into from
Jul 5, 2015
Merged

Fixed partials ordering and added missing responsive-embed one #18

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be8ed8
Fixed partials ordering and added missing responsive-embed one
mgtitimoli Jun 17, 2015
5b0c85a
Updated example config file with the changes done in partials
mgtitimoli Jun 17, 2015
3043f7e
Reverted to the use of single quotes instead of double ones
mgtitimoli Jun 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion bootstrap-sass-styles.loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var partials = [

"normalize",
"print",
"glyphicons",

"scaffolding",
"type",
Expand All @@ -13,7 +14,6 @@ var partials = [
"buttons",

"component-animations",
"glyphicons",
"dropdowns",
"button-groups",
"input-groups",
Expand All @@ -32,6 +32,7 @@ var partials = [
"list-group",
"panels",
"wells",
"responsive-embed",
"close",

"modals",
Expand Down
27 changes: 14 additions & 13 deletions bootstrap-sass.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,25 @@ module.exports = {
// styleLoader: ExtractTextPlugin.extract("style-loader", "css-loader!sass?outputStyle=expanded"),

scripts: {
'transition': true,
'alert': true,
'button': true,
'carousel': true,
'collapse': true,
'dropdown': true,
'modal': true,
'tooltip': true,
'popover': true,
'scrollspy': true,
'tab': true,
'affix': true
"transition": true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason to change to "". I've got the linter set to single quotes for JS.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Np 👍 I'll revert this now, I've just standardized to double quotes, since in all the other places in this file this is the kind used.

"alert": true,
"button": true,
"carousel": true,
"collapse": true,
"dropdown": true,
"modal": true,
"tooltip": true,
"popover": true,
"scrollspy": true,
"tab": true,
"affix": true
},
styles: {
"mixins": true,

"normalize": true,
"print": true,
"glyphicons": true,

"scaffolding": true,
"type": true,
Expand All @@ -57,7 +58,6 @@ module.exports = {
"buttons": true,

"component-animations": true,
"glyphicons": true,
"dropdowns": true,
"button-groups": true,
"input-groups": true,
Expand All @@ -76,6 +76,7 @@ module.exports = {
"list-group": true,
"panels": true,
"wells": true,
"responsive-embed": true,
"close": true,

"modals": true,
Expand Down