# HG changeset patch # User Nattee Niparnan # Date 2015-10-10 09:18:18 # Node ID d69093a5f3c27ca47fed5a9357a3d36042dafcc4 # Parent 6d57d5eff450de0b2e1a5abafd88d6ecd13d353a new branch for bootstrap diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -49,6 +49,11 @@ #syntax highlighter gem 'rouge' +#add bootstrap +gem 'bootstrap-sass', '~> 3.2.0' +gem 'autoprefixer-rails' + + gem 'haml' gem 'mail' gem 'rdiscount' diff --git a/Gemfile.lock b/Gemfile.lock --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,9 +37,14 @@ i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) + autoprefixer-rails (6.0.3) + execjs + json best_in_place (3.0.3) actionpack (>= 3.2) railties (>= 3.2) + bootstrap-sass (3.2.0.2) + sass (~> 3.2) builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -152,7 +157,9 @@ ruby DEPENDENCIES + autoprefixer-rails best_in_place (~> 3.0.1) + bootstrap-sass (~> 3.2.0) coffee-rails (~> 3.2.2) dynamic_form haml diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,3 +15,4 @@ //= require effects //= require dragdrop //= require controls +//= require bootstrap-sprockets diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -7,6 +7,10 @@ @import jquery-tablesorter/theme.metro-dark @import tablesorter-theme.cafe + +@import "bootstrap-sprockets" +@import "bootstrap" + body background: white image-url("topbg.jpg") repeat-x top center font-size: 13px diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - - - <%= GraderConfiguration['contest.name'] %> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - <%= content_for :header %> - <%= yield :head %> - - - - -
-<%= user_header %> -
- -<%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %> - -<%= yield %> - - -