Added bootstrap to the stylesheets and made some aesthetic changes to some of the pages.

Election/app/assets/stylesheets/bootstrap-theme.min.css.map

+{"version":3,"sources":["less/theme.less","less/mixins/vendor-prefixes.less","less/mixins/gradients.less","less/mixins/reset-filter.less"],"names":[],"mappings":"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"}
\ No newline at end of file

Election/app/views/admin/party_lists/index.html.erb

@@ -2,7 +2,7 @@
 <hr>
 <%= link_to("New Party List", new_admin_party_list_path) %>
 <hr>
-<table width="100%">
+<table width="100%", class="table table-hover">
   <tr>
       <th>Name</th>
   </tr>

Election/app/views/admin/positions/index.html.erb

@@ -2,7 +2,7 @@
 <hr>
 <%= link_to("New Position", new_admin_position_path) %>
 <hr>
-<table width="100%">
+<table width="100%", class="table table-hover">
 	<tr>
    		<th>Name</th>
 	</tr>

Election/app/views/candidates/index.html.erb

 <h1>List of Candidates</h1>
 <% @positions.each do |p| %>
   <h2><%= p.name %></h2>
-  <table>
+  <table class="table table-hover", width="100%">
   	<tr>
    		<th>Full Name</th> 
 	</tr>

Election/app/views/layouts/application.html.erb

@@ -8,11 +8,11 @@
 </head>
 <body>
 <% if user_signed_in? %>
-	<%= "You are logged in as: #{current_user.email}" %> &nbsp; <%= link_to 'Edit Profile', edit_user_registration_path %> || <%= link_to "Log Out", destroy_user_session_path, method: :delete %> ||
+	<%= "You are logged in as: #{current_user.email}" %> &nbsp; <button type="button" class="btn btn-default"><%= link_to 'Edit Profile', edit_user_registration_path %></button>  <button type="button" class="btn btn-default"><%= link_to "Log Out", destroy_user_session_path, method: :delete %></button> 
 <% else %>
 	<%= "" %>
 <% end %>
-<%= link_to "Homepage", root_path %>
+<button type="button" class="btn btn-default"><%= link_to "Homepage", root_path %></button>
 
 <%= yield %>
 

Election/app/views/pages/about.html.erb

 <!DOCTYPE html>
 <html>
-<h1> About Page</h1>
+<h1> About the Group</h1>
 <body>
-MIS21 - B
+ <div class="container-fluid">
 
-Alfonso Arvisu
-Bianca Tarun
-Dean Bardeloza
-Kristoff Sison
+	<h3>MIS21 - B</h2>
+
+	<h4>Alfonso Arvisu</h4>
+	<h4>Bianca Tarun</h4>
+	<h4>Dean Bardeloza</h4>
+	<h4>Kristoff Sison</h4>
+
+ </div>
 </body>
 </html>
\ No newline at end of file

Election/app/views/pages/index.html.erb

@@ -2,23 +2,23 @@
 <% if user_signed_in? %>
 <hr>
 	<% if current_user.email == "admin_email@yahoo.com" %>
-		<%= link_to "Manage Candidates", admin_candidates_path %> || 
-		<%= link_to "Manage Positions", admin_positions_path %> || 
-		<%= link_to "Manage Party Lists", admin_party_lists_path %> ||
-		<%= link_to "Vote", votes_new_path %> ||
-		<%= link_to "About", pages_about_path %> || 
-		<%= link_to "User Profile", votes_user_profile_path %>
+		<button type="button" class="btn btn-default"><%= link_to "Manage Candidates", admin_candidates_path %></button> 
+		<button type="button" class="btn btn-default"><%= link_to "Manage Positions", admin_positions_path %></button>
+		<button type="button" class="btn btn-default"><%= link_to "Manage Party Lists", admin_party_lists_path %></button>
+		<button type="button" class="btn btn-default"><%= link_to "Vote", votes_new_path %></button>
+		<button type="button" class="btn btn-default"><%= link_to "About", pages_about_path %></button>
+		<%= link_to "User Profile", votes_user_profile_path %></button>
 	<% else %>
-		<%= link_to "About", pages_about_path %> ||
-		<%= link_to "Vote", votes_new_path %> ||
-		<%= link_to "User Profile", votes_user_profile_path %>
+		<button type="button" class="btn btn-default"><%= link_to "About", pages_about_path %></button>
+		<button type="button" class="btn btn-default"><%= link_to "Vote", votes_new_path %></button>
+		<button type="button" class="btn btn-default"><%= link_to "User Profile", votes_user_profile_path %></button>
 	<% end %>
 <hr>
 <h1>List of Candidates</h1>
 		
 <% @positions.each do |p| %>
   <h2><%= p.name %></h2>
-  <table>
+  <table class="table table-hover", width="100%">
   	<tr>
    		<th>Full Name</th>
    		<th>Number of Votes</th> 
@@ -30,8 +30,8 @@
   </table>
 <% end %>
 <hr>
-<%= link_to "View all Candidates", candidates_path %>
-<%= link_to "View all Party Lists", party_lists_index_path %>
+<button type="button" class="btn btn-default"><%= link_to "View all Candidates", candidates_path %></button>
+<button type="button" class="btn btn-default"><%= link_to "View all Party Lists", party_lists_index_path %></button>
 <% else %> 
 	<h4>You are not signed in. Please <%= link_to "Login", new_user_session_path %> or <%= link_to "Sign Up", new_user_registration_path %> to proceed with voting.</h4>
 <% end %>
\ No newline at end of file

Election/app/views/positions/index.html.erb

@@ -2,7 +2,7 @@
 <hr>
 <%= link_to("New Position", new_admin_position_path) %>
 <hr>
-<table width="100%">
+<table width="100%", class="table table-hover">
 	<tr>
    		<th>Name</th>
 	</tr>

Election/db/migrate/20160720124015_add_description_to_party_lists.rb

-class AddDescriptionToPartyLists < ActiveRecord::Migration
-  def change
-    add_column :party_lists, :description_text, :string
-    remove_column :party_lists, :description_text, :string
-  end
-end

Election/db/schema.rb

@@ -28,9 +28,8 @@ ActiveRecord::Schema.define(version: 20160720134047) do
 
   create_table "party_lists", force: :cascade do |t|
     t.string   "name"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
-    t.string   "description_text"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
     t.text     "description"
   end