Skip to content

[WIP] Create new widget to display multiple CoderDojo in grid layout #4

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 3 commits into from
May 22, 2016
Merged

[WIP] Create new widget to display multiple CoderDojo in grid layout #4

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
11dab20
Add code to previous state for stylesheet to be read accordingly
nanophate May 13, 2016
66ca216
Add newer gem version for scrivito
nanophate May 13, 2016
21e610b
Add bootstrap style sheet
nanophate May 13, 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
4 changes: 3 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ruby '2.3.1'
gem 'pg', '~> 0.18.4'

gem 'rails', '4.2.6'
gem 'scrivito', '~> 1.3.0.rc1'
gem 'scrivito', '~> 1.3.0'

gem 'scrivito_section_widgets', '1.0.0'
gem 'scrivito_teaser_widget', '0.1.1'
Expand All @@ -13,6 +13,8 @@ gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'jquery-rails'

gem "bootstrap-sass", "~> 3.3.5"
gem 'bootstrap-material-design'
gem 'sass-rails', '~> 5.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'uglifier', '>= 1.3.0'
Expand Down
31 changes: 20 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,15 @@ GEM
tzinfo (~> 1.1)
addressable (2.4.0)
arel (6.0.3)
autoprefixer-rails (6.3.6)
execjs
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-material-design (0.2.2)
bootstrap-sass (~> 3.0)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -122,20 +129,20 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
scrivito (1.3.0.rc3)
scrivito (1.3.0)
railties
scrivito_content_browser (= 1.3.0.rc3)
scrivito_editors (= 1.3.0.rc3)
scrivito_sdk (= 1.3.0.rc3)
scrivito_content_browser (1.3.0.rc3)
scrivito_content_browser (= 1.3.0)
scrivito_editors (= 1.3.0)
scrivito_sdk (= 1.3.0)
scrivito_content_browser (1.3.0)
railties
scrivito_sdk (= 1.3.0.rc3)
scrivito_editors (1.3.0.rc3)
scrivito_sdk (= 1.3.0)
scrivito_editors (1.3.0)
jquery-ui-rails (>= 5.0.0)
railties
scrivito_content_browser (= 1.3.0.rc3)
scrivito_sdk (= 1.3.0.rc3)
scrivito_sdk (1.3.0.rc3)
scrivito_content_browser (= 1.3.0)
scrivito_sdk (= 1.3.0)
scrivito_sdk (1.3.0)
addressable (~> 2.3)
connection_pool (~> 2.2)
diff-lcs (~> 1.2)
Expand Down Expand Up @@ -182,13 +189,15 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-material-design
bootstrap-sass (~> 3.3.5)
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
pg (~> 0.18.4)
rails (= 4.2.6)
sass-rails (~> 5.0)
scrivito (~> 1.3.0.rc1)
scrivito (~> 1.3.0)
scrivito_section_widgets (= 1.0.0)
scrivito_teaser_widget (= 0.1.1)
sdoc (~> 0.4.0)
Expand Down
4 changes: 4 additions & 0 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@
//= require jquery_ujs
//= require scrivito
//= require scrivito_section_widgets
//= require scrivito
//= require bootstrap-sprockets
//= require bootstrap-material-design

8 changes: 6 additions & 2 deletions app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
*
*= require scrivito
*= require scrivito_section_widgets
*= require bootstrap-material-design
*/

@import "bootstrap-sprockets";
@import "bootstrap";

body {
text-align: center
align-content: center
}

6 changes: 4 additions & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

</head>
<body>
<%= yield %>
<%= scrivito_body_tags %>
<div class="container">
<%= yield %>
<%= scrivito_body_tags %>
</div>
</body>
</html>