Skip to content

Enhance Scrivito Template to resemble CoderDojo Website #1

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.

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 8 commits into from
May 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 13 additions & 46 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,57 +1,24 @@
source 'https://rubygems.org'
ruby '2.3.1'

gem 'pg', '~> 0.18.4'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
# Using postgres for heroku
gem 'pg'
# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
# gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# Use Scrivitio gem
gem 'scrivito', '~> 1.3.0.rc1'
gem 'bootstrap-sass', '~> 3.3.5'
gem 'scrivito_section_widgets'
gem 'scrivito_teaser_widget'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
gem 'scrivito_section_widgets', '1.0.0'
gem 'scrivito_teaser_widget', '0.1.1'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'jquery-rails'

end
gem 'sass-rails', '~> 5.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'uglifier', '>= 1.3.0'

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'spring', '1.7.1'
gem 'sqlite3', '1.3.11'
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'

# Use sqlite3 as the database for Active Record
gem 'sqlite3'
end

end
49 changes: 22 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,17 @@ 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-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
byebug (8.2.4)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
Expand Down Expand Up @@ -86,7 +80,7 @@ GEM
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.3)
multi_json (1.12.0)
multipart-post (2.0.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
Expand Down Expand Up @@ -128,20 +122,20 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
scrivito (1.3.0.rc1)
scrivito (1.3.0.rc3)
railties
scrivito_content_browser (= 1.3.0.rc1)
scrivito_editors (= 1.3.0.rc1)
scrivito_sdk (= 1.3.0.rc1)
scrivito_content_browser (1.3.0.rc1)
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)
railties
scrivito_sdk (= 1.3.0.rc1)
scrivito_editors (1.3.0.rc1)
scrivito_sdk (= 1.3.0.rc3)
scrivito_editors (1.3.0.rc3)
jquery-ui-rails (>= 5.0.0)
railties
scrivito_content_browser (= 1.3.0.rc1)
scrivito_sdk (= 1.3.0.rc1)
scrivito_sdk (1.3.0.rc1)
scrivito_content_browser (= 1.3.0.rc3)
scrivito_sdk (= 1.3.0.rc3)
scrivito_sdk (1.3.0.rc3)
addressable (~> 2.3)
connection_pool (~> 2.2)
diff-lcs (~> 1.2)
Expand All @@ -153,7 +147,7 @@ GEM
nokogiri (~> 1.6)
rails (~> 4.2.0)
rake (>= 0.9.2.2)
scrivito_section_widgets (0.90.1)
scrivito_section_widgets (1.0.0)
bundler
scrivito
scrivito_teaser_widget (0.1.1)
Expand Down Expand Up @@ -188,22 +182,23 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (~> 3.3.5)
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
pg
pg (~> 0.18.4)
rails (= 4.2.6)
sass-rails (~> 5.0)
scrivito (~> 1.3.0.rc1)
scrivito_section_widgets
scrivito_teaser_widget
scrivito_section_widgets (= 1.0.0)
scrivito_teaser_widget (= 0.1.1)
sdoc (~> 0.4.0)
spring
sqlite3
spring (= 1.7.1)
sqlite3 (= 1.3.11)
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.11.2
1.12.3
Loading