Skip to content

Commit

Permalink
switching bootstrap gem
Browse files Browse the repository at this point in the history
  • Loading branch information
mikegee committed Dec 19, 2012
1 parent 494ef80 commit f26e19c
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 19 deletions.
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ gem 'json'
# To use OAuth login
gem "oauth-plugin", "~> 0.4.0"

gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails',
:git => '[email protected]:anjlab/bootstrap-rails'
gem 'twitter-bootstrap-rails'
gem 'less-rails'

# use Devise for login
gem 'devise'
gem 'omniauth'
Expand Down
21 changes: 12 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
GIT
remote: [email protected]:anjlab/bootstrap-rails
revision: 178781059753555cc0d00aef56d8766049b81f93
specs:
anjlab-bootstrap-rails (2.2.2.0)
railties (>= 3.0)
sass (>= 3.2)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -52,6 +44,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.4.0)
commonjs (0.2.6)
daemons (1.1.9)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
Expand Down Expand Up @@ -81,6 +74,11 @@ GEM
json (1.7.5)
jwt (0.1.5)
multi_json (>= 1.0)
less (2.2.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.11.8.4)
mail (2.4.4)
i18n (>= 0.4.0)
Expand Down Expand Up @@ -172,6 +170,10 @@ GEM
turbo-sprockets-rails3 (0.2.13)
railties (>= 3.1.0, < 3.2.9)
sprockets (>= 2.0.0)
twitter-bootstrap-rails (2.1.9)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
Expand All @@ -183,13 +185,13 @@ PLATFORMS
ruby

DEPENDENCIES
anjlab-bootstrap-rails!
capistrano
coffee-rails (~> 3.2.1)
devise
factory_girl_rails
jquery-rails
json
less-rails
libv8
mysql2
oauth-plugin (~> 0.4.0)
Expand All @@ -203,4 +205,5 @@ DEPENDENCIES
therubyracer
thin
turbo-sprockets-rails3
twitter-bootstrap-rails
uglifier (>= 1.0.3)
4 changes: 4 additions & 0 deletions app/assets/javascripts/bootstrap.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
jQuery ->
$("a[rel=popover]").popover()
$(".tooltip").tooltip()
$("a[rel=tooltip]").tooltip()
4 changes: 0 additions & 4 deletions app/assets/stylesheets/app_bootstrap.css.scss

This file was deleted.

5 changes: 1 addition & 4 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
*= require_tree .
*/

/*
*= require app_bootstrap
*/
body {
padding-top :60px;
padding-top: 60px;
}
31 changes: 31 additions & 0 deletions app/assets/stylesheets/bootstrap_and_overrides.css.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
@import "twitter/bootstrap/bootstrap";

// 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)
// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
// have the proper paths. So for now we use the absolute path.
@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");

// Font Awesome
@import "fontawesome";

// Glyphicons
//@import "twitter/bootstrap/sprites.less";

// Your custom LESS stylesheets goes here
//
// Since bootstrap was imported above you have access to its mixins which
// you may use and inherit here
//
// If you'd like to override bootstrap's own variables, you can do so here as well
// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
//
// Example:
// @linkColor: #ff0000;

0 comments on commit f26e19c

Please sign in to comment.