SHIMADA Koji
null+****@clear*****
Thu Nov 22 16:40:51 JST 2012
SHIMADA Koji 2012-11-22 16:40:51 +0900 (Thu, 22 Nov 2012) New Revision: d279393c9343e6a676397f36a073e73ec7221251 https://github.com/logaling/logaling-server/commit/d279393c9343e6a676397f36a073e73ec7221251 Log: Bump twitter-bootstrap-rails version - update Gemfile - bundle update twitter-bootstrap-rails - rails g bootstrap:install Modified files: Gemfile Gemfile.lock app/assets/stylesheets/bootstrap_and_overrides.css.less Modified: Gemfile (+2 -0) =================================================================== --- Gemfile 2012-11-22 16:32:21 +0900 (88dd55a) +++ Gemfile 2012-11-22 16:40:51 +0900 (99b86a2) @@ -18,6 +18,8 @@ group :assets do # gem 'therubyracer' gem 'uglifier', '>= 1.0.3' + gem 'therubyracer' + gem 'less-rails' gem 'twitter-bootstrap-rails' end Modified: Gemfile.lock (+6 -5) =================================================================== --- Gemfile.lock 2012-11-22 16:32:21 +0900 (f5d6789) +++ Gemfile.lock 2012-11-22 16:40:51 +0900 (c7d3578) @@ -128,9 +128,9 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) - less (2.2.1) + less (2.2.2) commonjs (~> 0.2.6) - less-rails (2.2.3) + less-rails (2.2.6) actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.3.10.4) @@ -257,11 +257,10 @@ GEM treetop (1.4.12) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.1.3) + twitter-bootstrap-rails (2.1.6) actionpack (>= 3.1) - less-rails (~> 2.2.3) + execjs railties (>= 3.1) - therubyracer (~> 0.10.2) tzinfo (0.3.35) uglifier (1.2.7) execjs (>= 0.3.0) @@ -292,6 +291,7 @@ DEPENDENCIES iso-639 jquery-rails kaminari + less-rails logaling-command! omniauth omniauth-facebook @@ -303,5 +303,6 @@ DEPENDENCIES rspec-rails rvm-capistrano sass-rails (~> 3.2.3) + therubyracer twitter-bootstrap-rails uglifier (>= 1.0.3) Modified: app/assets/stylesheets/bootstrap_and_overrides.css.less (+11 -8) =================================================================== --- app/assets/stylesheets/bootstrap_and_overrides.css.less 2012-11-22 16:32:21 +0900 (909c066) +++ app/assets/stylesheets/bootstrap_and_overrides.css.less 2012-11-22 16:40:51 +0900 (0bc218f) @@ -2,27 +2,30 @@ @import "twitter/bootstrap/responsive"; // Set the correct sprite paths - at iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); - at iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); + at iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings"); + at 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 boostrap_and_overrides.css will not +// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not // have the proper paths. So for now we use the absolute path. - at fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; - at fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; - at fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; - at fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; + at fontAwesomeEotPath: asset-path("fontawesome-webfont.eot"); + at fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff"); + at fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf"); + at 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/less.html for their names and documentation +// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation // // Example: // @linkColor: #ff0000; -------------- next part -------------- An HTML attachment was scrubbed...ダウンロード
