Skip to content
This repository has been archived by the owner on May 25, 2019. It is now read-only.

Include Normalize.css if Bootstrap is not present #269

Closed
wants to merge 2 commits into from
Closed

Include Normalize.css if Bootstrap is not present #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49abc45
Include Normalize.css if Bootstrap is not present
silvenon Feb 6, 2014
829de24
When Sass & Compass with Bootstrap, don't include vendor.css
silvenon Feb 10, 2014
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
3 changes: 2 additions & 1 deletion app/templates/_bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"private": true,
"dependencies": {<% if (includeBootstrap) { if (includeCompass) { %>
"bootstrap-sass": "git://github.com/twbs/bootstrap-sass.git#v3.1.0",<% } else { %>
"bootstrap": "~3.0.3",<% }} if (includeModernizr) { %>
"bootstrap": "~3.0.3",<% }} else { %>
"normalize-css": "~3.0.0",<% } if (includeModernizr) { %>
"modernizr": "~2.6.2",<% } %>
"jquery": "~1.10.2"
},
Expand Down
11 changes: 8 additions & 3 deletions app/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@
<title><%= appname %></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- Place favicon.ico and apple-touch-icon.png in the root directory --><% if (!includeBootstrap) { %>
<!-- build:css styles/vendor.css -->
<!-- bower:css -->
<% if (includeBootstrap && !includeCompass) { %><link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"><% } %>
<link rel="stylesheet" href="bower_components/normalize-css/normalize.css">
<!-- endbower -->
<!-- endbuild -->
<!-- endbuild --><% } else if (includeBootstrap && !includeCompass) { %>
<!-- build:css styles/vendor.css -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<!-- endbower -->
<!-- endbuild --><% } %>
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
<!-- endbuild --><% if (includeModernizr) { %>
Expand Down