Skip to content

Integrate npm bootstrap-sass; Remove bootstrap-sass gem; Update README #3

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

Merged
merged 20 commits into from
Dec 13, 2014
Merged

Integrate npm bootstrap-sass; Remove bootstrap-sass gem; Update README #3

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7c6fb94
Integrate npm bootstrap-sass; Remove bootstrap-sass gem; Update README
mbreining Nov 24, 2014
3856dc8
Integrate with webpack ExtractTextPlugin
mbreining Nov 26, 2014
2c97240
Create webpack.common.config.js
mbreining Nov 27, 2014
8e860f7
Extract duplicate code into webpack.common.config
mbreining Nov 27, 2014
c8fc39a
Update README
mbreining Nov 27, 2014
5fb984d
Update README, take 2
mbreining Nov 27, 2014
53bf847
Update README, take 3
mbreining Nov 27, 2014
a98f761
Add foreman gem; Update Procfile.dev and README
mbreining Nov 27, 2014
8b44d97
Remove ExtractTextPlugin
mbreining Dec 1, 2014
c8172ea
Add bootstrap-sass gem; Use bootstrap-sass loader with local webpack …
mbreining Dec 1, 2014
142e892
Add bootstrap-sprockets to js manifest
mbreining Dec 2, 2014
e4a2a05
Add custom bootstrap css
mbreining Dec 5, 2014
09efcf9
Move bootstrap variables customization scss to webpack assets dir; Co…
mbreining Dec 5, 2014
3c59196
Consolidate webpack and rails bootstrap customization file
mbreining Dec 5, 2014
fb28f3f
Add comments; Do another pass on README
mbreining Dec 6, 2014
73d504b
Add section about Bootstrap integration
mbreining Dec 7, 2014
7a314d7
Incorporte Justin's comments
mbreining Dec 7, 2014
f82c7ab
Overwrite default body-bg variable (instant bootstrap customization f…
mbreining Dec 7, 2014
e979382
Fix Readme
mbreining Dec 8, 2014
223b549
Rename webpack rails config file back to webpack.rails.config.js
mbreining Dec 8, 2014
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Overwrite default body-bg variable (instant bootstrap customization f… 
…eedback)
  • Loading branch information
@mbreining
mbreining committed Dec 7, 2014
commit f82c7ab3396368f837e97fb88c4cb47c67ba8fc8
1 change: 1 addition & 0 deletions webpack/assets/stylesheets/_bootstrap-variables-customization.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
$body-bg: #EFF8FB; // background w/ character
$navbar-default-bg: #FFFFE0; // fancy yellow navbar
$font-size-base: 15px; // make it bigger!