Skip to content

Commit 21e610b

Browse files
committed
Add bootstrap style sheet
1 parent 66ca216 commit 21e610b

File tree

5 files changed

+23
-7
lines changed

5 files changed

+23
-7
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ gem 'coffee-rails', '~> 4.1.0'
1313
gem 'jbuilder', '~> 2.0'
1414
gem 'jquery-rails'
1515

16+
gem "bootstrap-sass", "~> 3.3.5"
17+
gem 'bootstrap-material-design'
1618
gem 'sass-rails', '~> 5.0'
1719
gem 'sdoc', '~> 0.4.0', group: :doc
1820
gem 'uglifier', '>= 1.3.0'

Gemfile.lock

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@ GEM
3838
tzinfo (~> 1.1)
3939
addressable (2.4.0)
4040
arel (6.0.3)
41+
autoprefixer-rails (6.3.6)
42+
execjs
4143
binding_of_caller (0.7.2)
4244
debug_inspector (>= 0.0.1)
45+
bootstrap-material-design (0.2.2)
46+
bootstrap-sass (~> 3.0)
47+
bootstrap-sass (3.3.6)
48+
autoprefixer-rails (>= 5.2.1)
49+
sass (>= 3.3.4)
4350
builder (3.2.2)
4451
coffee-rails (4.1.1)
4552
coffee-script (>= 2.2.0)
@@ -182,6 +189,8 @@ PLATFORMS
182189
ruby
183190

184191
DEPENDENCIES
192+
bootstrap-material-design
193+
bootstrap-sass (~> 3.3.5)
185194
coffee-rails (~> 4.1.0)
186195
jbuilder (~> 2.0)
187196
jquery-rails

app/assets/javascripts/application.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@
1414
//= require jquery_ujs
1515
//= require scrivito
1616
//= require scrivito_section_widgets
17+
//= require scrivito
18+
//= require bootstrap-sprockets
19+
//= require bootstrap-material-design
20+

app/assets/stylesheets/application.css renamed to app/assets/stylesheets/application.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
*
1313
*= require scrivito
1414
*= require scrivito_section_widgets
15+
*= require bootstrap-material-design
1516
*/
1617

18+
@import "bootstrap-sprockets";
19+
@import "bootstrap";
1720

1821
body {
19-
text-align: center
22+
align-content: center
2023
}
21-
22-
.container{
23-
background-color: blue
24-
}

app/views/layouts/application.html.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
</head>
1111
<body>
12-
<%= yield %>
13-
<%= scrivito_body_tags %>
12+
<div class="container">
13+
<%= yield %>
14+
<%= scrivito_body_tags %>
15+
</div>
1416
</body>
1517
</html>

0 commit comments

Comments
 (0)