quick and dirty css

15 files changed, 2 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index cc95938..cb3d6f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.2'
 
-gem 'bootstrap-sass'
 
 # bcrypt is used for password digesting
 gem 'bcrypt-ruby', '3.1.2'
@@ -23,6 +22,7 @@ end
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.0'
+gem 'bootstrap-sass'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
diff --git a/db/migrate/20140304015610_create_servers.rb b/db/migrate/20140304015739_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015610_create_servers.rb
+++ b/db/migrate/20140304015739_create_servers.rb
diff --git a/db/migrate/20140304015612_create_tournaments.rb b/db/migrate/20140304015742_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304015612_create_tournaments.rb
+++ b/db/migrate/20140304015742_create_tournaments.rb
diff --git a/db/migrate/20140304015615_create_matches.rb b/db/migrate/20140304015744_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015615_create_matches.rb
+++ b/db/migrate/20140304015744_create_matches.rb
diff --git a/db/migrate/20140304015617_create_teams.rb b/db/migrate/20140304015746_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015617_create_teams.rb
+++ b/db/migrate/20140304015746_create_teams.rb
diff --git a/db/migrate/20140304015622_create_users.rb b/db/migrate/20140304015751_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304015622_create_users.rb
+++ b/db/migrate/20140304015751_create_users.rb
diff --git a/db/migrate/20140304015624_create_user_team_pairs.rb b/db/migrate/20140304015753_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015624_create_user_team_pairs.rb
+++ b/db/migrate/20140304015753_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015626_create_team_match_pairs.rb b/db/migrate/20140304015755_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015626_create_team_match_pairs.rb
+++ b/db/migrate/20140304015755_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015628_create_alerts.rb b/db/migrate/20140304015757_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015628_create_alerts.rb
+++ b/db/migrate/20140304015757_create_alerts.rb
diff --git a/db/migrate/20140304015631_create_pms.rb b/db/migrate/20140304015800_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015631_create_pms.rb
+++ b/db/migrate/20140304015800_create_pms.rb
diff --git a/db/migrate/20140304015633_create_games.rb b/db/migrate/20140304015802_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304015633_create_games.rb
+++ b/db/migrate/20140304015802_create_games.rb
diff --git a/db/migrate/20140304015635_create_game_attributes.rb b/db/migrate/20140304015804_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015635_create_game_attributes.rb
+++ b/db/migrate/20140304015804_create_game_attributes.rb
diff --git a/db/migrate/20140304015638_create_server_settings.rb b/db/migrate/20140304015807_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015638_create_server_settings.rb
+++ b/db/migrate/20140304015807_create_server_settings.rb
diff --git a/db/migrate/20140304015644_create_tournament_options.rb b/db/migrate/20140304015813_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015644_create_tournament_options.rb
+++ b/db/migrate/20140304015813_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index d44352e..ae688b1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140304015644) do
+ActiveRecord::Schema.define(version: 20140304015813) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"