back to bootswatch.
This commit is contained in:
parent
2bf0833fc4
commit
70aec0b86e
2
Gemfile
2
Gemfile
|
@ -18,7 +18,7 @@ gem 'bcrypt', '~> 3.1.7'
|
|||
|
||||
gem 'haml'
|
||||
gem 'bootstrap-sass', '~> 3.2.0.1'
|
||||
gem 'bootstrap-material-design'
|
||||
gem 'bootswatch-rails'
|
||||
gem 'will_paginate'
|
||||
gem 'http_accept_language'
|
||||
gem 'devise'
|
||||
|
|
|
@ -29,11 +29,11 @@ GEM
|
|||
tzinfo (~> 1.1)
|
||||
arel (5.0.1.20140414130214)
|
||||
bcrypt (3.1.9)
|
||||
bootstrap-material-design (0.1.3)
|
||||
bootstrap-sass (~> 3.0)
|
||||
bootstrap-sass (3.2.0.2)
|
||||
sass (~> 3.2)
|
||||
bootstrap_form (2.2.0)
|
||||
bootswatch-rails (3.2.4)
|
||||
railties (>= 3.1)
|
||||
builder (3.2.2)
|
||||
capybara (2.4.4)
|
||||
mime-types (>= 1.16)
|
||||
|
@ -201,9 +201,9 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
bcrypt (~> 3.1.7)
|
||||
bootstrap-material-design
|
||||
bootstrap-sass (~> 3.2.0.1)
|
||||
bootstrap_form
|
||||
bootswatch-rails
|
||||
capybara
|
||||
coffee-rails (~> 4.1.0)
|
||||
database_cleaner
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#= require jquery.turbolinks
|
||||
#= require turbolinks
|
||||
#= require bootstrap
|
||||
#= require bootstrap-material-design
|
||||
#= require nprogress
|
||||
#= require nprogress-turbolinks
|
||||
#= require_tree .
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
/*
|
||||
*= require rails_bootstrap_forms
|
||||
*= require_self
|
||||
*= require bootstrap-material-design
|
||||
*/
|
||||
|
||||
|
||||
@import "bootswatch/paper/variables";
|
||||
|
||||
@import "bootstrap";
|
||||
body { padding-top: $navbar-height; }
|
||||
@import "bootswatch/paper/bootswatch";
|
||||
|
||||
@import "base";
|
||||
|
||||
@import "font-awesome";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%nav.navbar.navbar-default.navbar-fixed-top{role: "navigation"}
|
||||
%nav.navbar.navbar-inverse.navbar-fixed-top{role: "navigation"}
|
||||
.container
|
||||
.navbar-header
|
||||
%button.navbar-toggle{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"}
|
||||
|
|
Loading…
Reference in New Issue