FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

back to bootswatch.

This commit is contained in:
nilsding 2014-11-28 20:23:17 +01:00
parent 2bf0833fc4
commit 70aec0b86e
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -18,7 +18,7 @@ gem 'bcrypt', '~> 3.1.7'
gem 'haml' gem 'haml'
gem 'bootstrap-sass', '~> 3.2.0.1' gem 'bootstrap-sass', '~> 3.2.0.1'
gem 'bootstrap-material-design' gem 'bootswatch-rails'
gem 'will_paginate' gem 'will_paginate'
gem 'http_accept_language' gem 'http_accept_language'
gem 'devise' gem 'devise'

6
Gemfile.lock
View File

@ -29,11 +29,11 @@ GEM
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
bcrypt (3.1.9) bcrypt (3.1.9)
bootstrap-material-design (0.1.3)
bootstrap-sass (~> 3.0)
bootstrap-sass (3.2.0.2) bootstrap-sass (3.2.0.2)
sass (~> 3.2) sass (~> 3.2)
bootstrap_form (2.2.0) bootstrap_form (2.2.0)
bootswatch-rails (3.2.4)
railties (>= 3.1)
builder (3.2.2) builder (3.2.2)
capybara (2.4.4) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -201,9 +201,9 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
bootstrap-material-design
bootstrap-sass (~> 3.2.0.1) bootstrap-sass (~> 3.2.0.1)
bootstrap_form bootstrap_form
bootswatch-rails
capybara capybara
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
database_cleaner database_cleaner

1
app/assets/javascripts/application.js.erb.coffee
View File

@ -3,7 +3,6 @@
#= require jquery.turbolinks #= require jquery.turbolinks
#= require turbolinks #= require turbolinks
#= require bootstrap #= require bootstrap
#= require bootstrap-material-design
#= require nprogress #= require nprogress
#= require nprogress-turbolinks #= require nprogress-turbolinks
#= require_tree . #= require_tree .

6
app/assets/stylesheets/application.css.scss
View File

@ -1,11 +1,15 @@
/* /*
*= require rails_bootstrap_forms *= require rails_bootstrap_forms
*= require_self *= require_self
*= require bootstrap-material-design
*/ */
@import "bootswatch/paper/variables";
@import "bootstrap"; @import "bootstrap";
body { padding-top: $navbar-height; } body { padding-top: $navbar-height; }
@import "bootswatch/paper/bootswatch";
@import "base"; @import "base";
@import "font-awesome"; @import "font-awesome";

2
app/views/layouts/_header.html.haml
View File

@ -1,4 +1,4 @@
%nav.navbar.navbar-default.navbar-fixed-top{role: "navigation"} %nav.navbar.navbar-inverse.navbar-fixed-top{role: "navigation"}
.container .container
.navbar-header .navbar-header
%button.navbar-toggle{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"} %button.navbar-toggle{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"}