SHIMADA Koji
null+****@clear*****
Thu Aug 30 19:48:05 JST 2012
SHIMADA Koji 2012-08-30 19:48:05 +0900 (Thu, 30 Aug 2012) New Revision: 8aab9d1172ae7296b08c103f3e5b3d4eed607161 https://github.com/logaling/logaling-server/commit/8aab9d1172ae7296b08c103f3e5b3d4eed607161 Merged 35e0d3a: Merge pull request #10 from logaling/update-twitter-bootstrap-rails Log: rails g bootstrap:install Modified files: app/assets/stylesheets/bootstrap_and_overrides.css.less app/views/layouts/application.html.haml Modified: app/assets/stylesheets/bootstrap_and_overrides.css.less (+15 -0) =================================================================== --- app/assets/stylesheets/bootstrap_and_overrides.css.less 2012-08-30 19:47:35 +0900 (4210c11) +++ app/assets/stylesheets/bootstrap_and_overrides.css.less 2012-08-30 19:48:05 +0900 (14bf301) @@ -1,10 +1,25 @@ @import "twitter/bootstrap/bootstrap"; +body { + padding-top: 60px; +} + @import "twitter/bootstrap/responsive"; // Set the correct sprite paths @iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); @iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); +// 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 +// 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'; + +// Font Awesome + at import "fontawesome"; + // Your custom LESS stylesheets goes here // // Since bootstrap was imported above you have access to its mixins which Modified: app/views/layouts/application.html.haml (+0 -4) =================================================================== --- app/views/layouts/application.html.haml 2012-08-30 19:47:35 +0900 (93a66f7) +++ app/views/layouts/application.html.haml 2012-08-30 19:48:05 +0900 (72a0b7f) @@ -9,10 +9,6 @@ = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" / Le styles = stylesheet_link_tag "application" - :css - body { - padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ - } / Le fav and touch icons %link{:href => "images/favicon.ico", :rel => "shortcut icon"}/ %link{:href => "images/apple-touch-icon.png", :rel => "apple-touch-icon"}/ -------------- next part -------------- An HTML attachment was scrubbed...Télécharger
