diff --git a/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass b/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass index 1bc76df2..7e91e519 100644 --- a/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass +++ b/app/assets/stylesheets/twitter-bootstrap/bootstrap_overrides.css.sass @@ -1,10 +1,11 @@ //BOOTSTRAP overrides body + .main-content + h1, h2, h3, h4 + color: #eee a color: white - &:hover - color: white .table-hover tbody tr diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index 945d774c..09190f82 100644 --- a/app/views/layouts/tablet.html.slim +++ b/app/views/layouts/tablet.html.slim @@ -11,7 +11,6 @@ html lang="en" /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = stylesheet_link_tag "supplier/application", :media => "all" - = stylesheet_link_tag "supplier/application", :media => "all" link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144" link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114" link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72" @@ -50,7 +49,7 @@ html lang="en" li= link_to Table.model_name.human_plural, suppliers_tables_path li= link_to List.model_name.human_plural, suppliers_lists_path .container - .content + .content.main-content - if flash[:alert].present? .alert.alert-error a.close data-dismiss="alert" × diff --git a/app/views/layouts/twitter-bootstrap.html.slim b/app/views/layouts/twitter-bootstrap.html.slim index c869959e..e66d0c45 100644 --- a/app/views/layouts/twitter-bootstrap.html.slim +++ b/app/views/layouts/twitter-bootstrap.html.slim @@ -42,7 +42,7 @@ html lang="en" .alert.alert-success a.close data-dismiss="alert" × div= flash[:notice] - .row + .row.main-content .span9 = yield .span3 diff --git a/config/deploy.rb b/config/deploy.rb index a0c4780c..e94a9cb2 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,9 +1,9 @@ -$:.unshift(File.expand_path('./lib', ENV['rvm_path'])) +#$:.unshift(File.expand_path('./lib', ENV['rvm_path'])) require "bundler/capistrano" load 'deploy/assets' # Load RVM's capistrano plugin. -require "rvm/capistrano" +#require "rvm/capistrano" set :application, "qwaiter" set :repository, "root@uflows.com:/var/git/qrammer_rails.git"