bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Merge branch 'release/0.3.0'

Browse Source
This commit is contained in:
Geremia Taglialatela 2013-05-11 15:42:23 +02:00
commit 13fd6c53ce
6 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
Changelog
=========
0.3.0
-----
* Fontawesome 3.1.1
0.2.0
-----
* Rails 4 rc1

2
Gemfile
View File

@ -42,7 +42,7 @@ gem 'less-rails'
gem 'sass-rails', '~> 4.0.0.rc1'
gem 'therubyracer'
gem 'turbolinks'
gem 'twitter-bootstrap-rails'
gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.1.1'
gem 'uglifier', '>= 1.3.0'
group :development, :test do

37
Gemfile.lock
View File

@ -5,6 +5,17 @@ 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:
@ -34,7 +45,7 @@ GEM
tzinfo (~> 0.3.37)
addressable (2.3.4)
arel (4.0.0)
atomic (1.1.8)
atomic (1.1.9)
better_errors (0.8.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@ -43,6 +54,7 @@ GEM
builder (3.1.4)
bullet (4.6.0)
uniform_notifier
callsite (0.0.11)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@ -129,22 +141,23 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_request (0.2.3)
meta_request (0.2.5)
callsite
rack-contrib
railties
method_source (0.8.1)
mime-types (1.23)
minitest (4.7.4)
mono_logger (1.0.1)
multi_json (1.7.2)
multi_json (1.7.3)
nokogiri (1.5.9)
pg (0.15.1)
polyglot (0.3.3)
pry (0.9.12.1)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
pry-rails (0.2.2)
pry-rails (0.3.0)
pry (>= 0.9.10)
rack (1.5.2)
rack-contrib (1.1.0)
@ -169,7 +182,7 @@ GEM
raindrops (0.11.0)
rake (10.0.4)
redis (3.0.4)
redis-namespace (1.2.1)
redis-namespace (1.3.0)
redis (~> 3.0.0)
ref (1.0.4)
resque (1.24.1)
@ -196,7 +209,7 @@ GEM
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rubyzip (0.9.9)
sass (3.2.8)
sass (3.2.9)
sass-rails (4.0.0.rc1)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
@ -236,18 +249,14 @@ GEM
thor (0.18.1)
thread_safe (0.1.0)
atomic
tilt (1.4.0)
tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.1.1)
coffee-rails
twitter-bootstrap-rails (2.2.6)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.37)
uglifier (2.0.1)
uglifier (2.1.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.2)
@ -306,7 +315,7 @@ DEPENDENCIES
therubyracer
thin
turbolinks
twitter-bootstrap-rails
twitter-bootstrap-rails!
uglifier (>= 1.3.0)
unicorn
webmock

2
VERSION
View File

@ -1 +1 @@
0.2.0
0.3.0

11
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View File

@ -13,11 +13,12 @@ body {
/* Fontawesome Icons
========================================================================== */
@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot?v=3.0.2");
@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot?#iefix&v=3.0.2");
@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff?v=3.0.2");
@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf?v=3.0.2");
@import "fontawesome";
@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");
@import "fontawesome/font-awesome";
/* Overriding default variables and loading new ones
========================================================================== */

5
app/views/pages/home.html.haml
View File

@ -1,2 +1,7 @@
- title t('hello')
%h1= t('hello')
%h2
%i.icon-smile
Smile!
%p.lead.muted
Rails 4 + Ruby 2 + Font Awesome 3.1.1