Permalink
Browse files

Adding twitter bootstrap for the styling

  • Loading branch information...
1 parent 56a5b50 commit fd56e99c27bdeb3b00423933bb89e825f5c3438e Marc Jeanson committed Jan 25, 2012
Showing with 29 additions and 2 deletions.
  1. +1 −0 Gemfile
  2. +14 −0 Gemfile.lock
  3. +5 −0 app/assets/stylesheets/application.css
  4. +9 −2 app/views/layouts/application.html.slim
View
@@ -24,6 +24,7 @@ end
gem 'jquery-rails'
gem 'slim'
gem 'simple_form'
+gem 'less-rails-bootstrap'
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
View
@@ -50,6 +50,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
+ commonjs (0.2.0)
+ therubyracer (~> 0.9.9)
cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -86,6 +88,15 @@ GEM
json (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
+ less (2.0.9)
+ commonjs (~> 0.2.0)
+ therubyracer (~> 0.9.9)
+ less-rails (2.1.3)
+ actionpack (>= 3.1)
+ less (~> 2.0.7)
+ less-rails-bootstrap (1.4.3)
+ less-rails (~> 2.1.0)
+ libv8 (3.3.10.4)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -161,6 +172,8 @@ GEM
tilt (~> 1.1, != 1.3.0)
temple (0.3.5)
term-ansicolor (1.0.7)
+ therubyracer (0.9.9)
+ libv8 (~> 3.3.10)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -190,6 +203,7 @@ DEPENDENCIES
faker
jquery-rails
launchy
+ less-rails-bootstrap
pg
rails (= 3.2.0)
rspec-rails
@@ -8,6 +8,11 @@
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
+ *= require twitter/bootstrap
*= require_self
*= require_tree .
*/
+
+body{
+ padding-top: 40px;
+}
@@ -7,5 +7,12 @@ html
= csrf_meta_tags
body
- == render 'layouts/timer'
- == yield
+ div class="topbar"
+ div class="topbar-inner"
+ div class="container"
+ ul class="nav"
+ li class="active" = link_to t('navigation.activities'), activities_path
+ li = link_to t('navigation.new_activity'), new_activity_path
+ div class="container"
+ == render 'layouts/timer'
+ == yield

0 comments on commit fd56e99

Please sign in to comment.