From 39ea68f46682a55e4a461ab1fca848319c4f73e8 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 11 May 2013 15:43:39 +0200 Subject: [PATCH 1/2] Bumped development version to 0.4.0 [ci skip] --- CHANGELOG.md | 3 +++ VERSION | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 248fabe..da7593a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Changelog ========= +0.4.0 +----- + 0.3.0 ----- * Fontawesome 3.1.1 diff --git a/VERSION b/VERSION index 0d91a54..1d0ba9e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.0 +0.4.0 From 0c67e4e0b81327216bcf9c57b78e11597c910b54 Mon Sep 17 00:00:00 2001 From: Cesidio Di Landa Date: Wed, 12 Jun 2013 10:58:57 +0200 Subject: [PATCH 2/2] Rails 4 rc2 --- CHANGELOG.md | 1 + Gemfile | 4 +- Gemfile.lock | 132 +++++++++--------- README.md | 2 +- .../bootstrap_and_overrides.css.less | 21 +-- app/views/pages/home.html.haml | 4 +- config/environment.rb | 4 +- config/locales/en.bootstrap.yml | 18 +++ 8 files changed, 101 insertions(+), 85 deletions(-) create mode 100644 config/locales/en.bootstrap.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index da7593a..69d19e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Changelog 0.4.0 ----- +* Rails 4 rc2 0.3.0 ----- diff --git a/Gemfile b/Gemfile index 61cf165..026e7ed 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.0.0' -gem 'rails', '4.0.0.rc1' +gem 'rails', '4.0.0.rc2' # Servers gem 'thin' @@ -42,7 +42,7 @@ gem 'less-rails' gem 'sass-rails', '~> 4.0.0.rc1' gem 'therubyracer' gem 'turbolinks' -gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.1.1' +gem 'twitter-bootstrap-rails' gem 'uglifier', '>= 1.3.0' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index de8bbca..2931461 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,39 +5,28 @@ GIT specs: database_cleaner (0.9.1) -GIT - remote: git://github.com/diowa/twitter-bootstrap-rails.git - revision: c0f5b77b917e7ff91978b49ff559671e4861888f - branch: fontawesome-3.1.1 - specs: - twitter-bootstrap-rails (2.2.6) - actionpack (>= 3.1) - execjs - rails (>= 3.1) - railties (>= 3.1) - GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0.rc1) - actionpack (= 4.0.0.rc1) + actionmailer (4.0.0.rc2) + actionpack (= 4.0.0.rc2) mail (~> 2.5.3) - actionpack (4.0.0.rc1) - activesupport (= 4.0.0.rc1) + actionpack (4.0.0.rc2) + activesupport (= 4.0.0.rc2) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.0.rc1) - activesupport (= 4.0.0.rc1) + activemodel (4.0.0.rc2) + activesupport (= 4.0.0.rc2) builder (~> 3.1.0) - activerecord (4.0.0.rc1) - activemodel (= 4.0.0.rc1) + activerecord (4.0.0.rc2) + activemodel (= 4.0.0.rc2) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0.rc1) + activesupport (= 4.0.0.rc2) arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.2) - activesupport (4.0.0.rc1) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.0.rc2) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -46,10 +35,10 @@ GEM addressable (2.3.4) arel (4.0.0) atomic (1.1.9) - better_errors (0.8.0) + better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) - binding_of_caller (0.7.1) + binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.1.4) bullet (4.6.0) @@ -81,15 +70,16 @@ GEM rest-client simplecov (>= 0.7) thor - crack (0.3.2) + crack (0.4.0) + safe_yaml (~> 0.9.0) daemons (1.1.9) debug_inspector (0.0.2) - debugger (1.5.0) + debugger (1.6.0) columnize (>= 0.3.1) debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.2.0) + debugger-ruby_core_source (~> 1.2.1) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.2.0) + debugger-ruby_core_source (1.2.2) delorean (2.1.0) chronic diff-lcs (1.2.4) @@ -107,22 +97,22 @@ GEM railties (>= 3.0.0) faker (1.1.2) i18n (~> 0.5) - ffi (1.8.1) - haml (4.0.2) + ffi (1.9.0) + haml (4.0.3) tilt - haml_assets (0.2.1) + haml_assets (0.2.2) haml tilt - handlebars_assets (0.12.0) + handlebars_assets (0.13.0) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt - hike (1.2.2) + hike (1.2.3) http_accept_language (1.0.2) i18n (0.6.4) i18n-js (2.1.2) i18n - jquery-rails (2.2.1) + jquery-rails (3.0.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-turbolinks (1.0.0) @@ -137,27 +127,28 @@ GEM actionpack (>= 3.1) less (~> 2.3.1) libv8 (3.11.8.17) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - meta_request (0.2.5) + meta_request (0.2.6) callsite rack-contrib railties method_source (0.8.1) mime-types (1.23) + mini_portile (0.5.0) minitest (4.7.4) - mono_logger (1.0.1) - multi_json (1.7.3) - nokogiri (1.5.9) + mono_logger (1.1.0) + multi_json (1.7.6) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) pg (0.15.1) polyglot (0.3.3) pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) - pry-rails (0.3.0) + pry-rails (0.3.1) pry (>= 0.9.10) rack (1.5.2) rack-contrib (1.1.0) @@ -166,17 +157,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0.rc1) - actionmailer (= 4.0.0.rc1) - actionpack (= 4.0.0.rc1) - activerecord (= 4.0.0.rc1) - activesupport (= 4.0.0.rc1) + rails (4.0.0.rc2) + actionmailer (= 4.0.0.rc2) + actionpack (= 4.0.0.rc2) + activerecord (= 4.0.0.rc2) + activesupport (= 4.0.0.rc2) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0.rc1) - sprockets-rails (~> 2.0.0.rc4) - railties (4.0.0.rc1) - actionpack (= 4.0.0.rc1) - activesupport (= 4.0.0.rc1) + railties (= 4.0.0.rc2) + sprockets-rails (~> 2.0.0) + railties (4.0.0.rc2) + actionpack (= 4.0.0.rc2) + activesupport (= 4.0.0.rc2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.11.0) @@ -184,7 +175,7 @@ GEM redis (3.0.4) redis-namespace (1.3.0) redis (~> 3.0.0) - ref (1.0.4) + ref (1.0.5) resque (1.24.1) mono_logger (~> 1.0) multi_json (~> 1.0) @@ -201,7 +192,7 @@ GEM rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.13.1) - rspec-rails (2.13.1) + rspec-rails (2.13.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -209,33 +200,33 @@ GEM rspec-expectations (~> 2.13.0) rspec-mocks (~> 2.13.0) rubyzip (0.9.9) + safe_yaml (0.9.3) sass (3.2.9) - sass-rails (4.0.0.rc1) + sass-rails (4.0.0.rc2) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) - sprockets-rails (~> 2.0.0.rc0) - tilt (~> 1.3) - selenium-webdriver (2.32.1) + sprockets-rails (~> 2.0.0) + selenium-webdriver (2.33.0) childprocess (>= 0.2.5) multi_json (~> 1.0) rubyzip websocket (~> 1.0.4) - simpleconfig (2.0.0) + simpleconfig (2.0.1) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - sinatra (1.4.2) - rack (~> 1.5, >= 1.5.2) + sinatra (1.4.3) + rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) - slop (3.4.4) - sprockets (2.9.3) + slop (3.4.5) + sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0.rc4) + sprockets-rails (2.0.0) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -250,13 +241,18 @@ GEM thread_safe (0.1.0) atomic tilt (1.4.1) - treetop (1.4.12) + treetop (1.4.14) polyglot polyglot (>= 0.3.1) - turbolinks (1.1.1) + turbolinks (1.2.0) coffee-rails + twitter-bootstrap-rails (2.2.7) + actionpack (>= 3.1) + execjs + rails (>= 3.1) + railties (>= 3.1) tzinfo (0.3.37) - uglifier (2.1.0) + uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.2) @@ -303,7 +299,7 @@ DEPENDENCIES pg pry pry-rails - rails (= 4.0.0.rc1) + rails (= 4.0.0.rc2) resque rest-client rspec @@ -315,7 +311,7 @@ DEPENDENCIES therubyracer thin turbolinks - twitter-bootstrap-rails! + twitter-bootstrap-rails uglifier (>= 1.3.0) unicorn webmock diff --git a/README.md b/README.md index 86ed038..de970b1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Starter App [![Build Status](https://travis-ci.org/diowa/ruby2-rails4-bootstrap- This is a starter web application based on the following technology stack: * Ruby 2 -* Rails 4 +* Rails 4.0.0.rc2 * PostgreSQL * RSpec * Twitter Bootstrap diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 5a1efb0..5681cc0 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -1,26 +1,27 @@ -/* ========================================================================== - Bootstrap and overrides - ========================================================================== */ - @import "twitter/bootstrap/bootstrap"; body { - padding-top: 60px; + padding-top: @navbarHeight + 10px; } @import "twitter/bootstrap/responsive"; -/* Fontawesome Icons - ========================================================================== */ +// Set the correct sprite paths +//@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings"); +//@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white"); +// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) @fontAwesomeEotPath: asset-url("fontawesome-webfont.eot"); @fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix"); @fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff"); @fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf"); @fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular"); + +// Font Awesome @import "fontawesome/font-awesome"; -/* Overriding default variables and loading new ones - ========================================================================== */ +// Glyphicons +//@import "twitter/bootstrap/sprites.less"; + +// Override the default bootstrap variables in stubs/variables_overrides.css.less -@import "stubs/variables_overrides.css.less"; diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml index 86b637e..b00a460 100644 --- a/app/views/pages/home.html.haml +++ b/app/views/pages/home.html.haml @@ -3,5 +3,5 @@ %h2 %i.icon-smile Smile! - %p.lead.muted - Rails 4 + Ruby 2 + Font Awesome 3.1.1 +%p.lead.muted + Ruby 2 + Rails 4.0.0.rc2 + Font Awesome 3.1.1 diff --git a/config/environment.rb b/config/environment.rb index f0c46b2..8212ed4 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,5 @@ -# Load the rails application. +# Load the Rails application. require File.expand_path('../application', __FILE__) -# Initialize the rails application. +# Initialize the Rails application. Starterapp::Application.initialize! diff --git a/config/locales/en.bootstrap.yml b/config/locales/en.bootstrap.yml new file mode 100644 index 0000000..664de2b --- /dev/null +++ b/config/locales/en.bootstrap.yml @@ -0,0 +1,18 @@ +# Sample localization file for English. Add more files in this directory for other locales. +# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. + +en: + helpers: + actions: "Actions" + links: + back: "Back" + cancel: "Cancel" + confirm: "Are you sure?" + destroy: "Delete" + new: "New" + edit: "Edit" + titles: + edit: "Edit" + save: "Save" + new: "New" + delete: "Delete"