c and p index

Halalan-trial/app/assets/stylesheets/ver1.css.scss

-.box{
-    width: 400px;
-    height: 300px;
-    background-color: white;
-    border: none;
-    padding: 10px;
-    float: left;
-}
 
 table {
     width: 100%;

Halalan-trial/app/views/admin/candidates/index.html.erb

@@ -11,7 +11,15 @@
 			<%@positions.each do |p|%>
 			<hr>
 			<h3><center><%=p.name%></center></h3>
+<<<<<<< HEAD
 				<table>
+=======
+				<table class="table table-hover">
+					<thead>
+						<th witdth = "40%"><center>Name</center></th>
+						<th><center>Slogan</center></th>
+					</thead>
+>>>>>>> 3a7c99764459a08d3b3963ee6e918b827b0e4445
 					<%p.candidates.each do |c|%>
 						<tr>
 							<td>

Halalan-trial/app/views/layouts/_navbar.html.erb

@@ -14,9 +14,9 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
         <li class="<%= yield(:home) %>" ><%= link_to "Home", root_path %></li>
-        <li class="<%= yield(:about) %>" ><%= link_to "About", about_path %></li>
         <li class="<%= yield(:candidate) %>" ><%= link_to "Candidates", admin_candidates_path %></li>
         <li class="<%= yield(:position) %>" ><%= link_to "Positions", admin_positions_path %></li>
+        <li class="<%= yield(:about) %>" ><%= link_to "About", about_path %></li>
       </ul>
         <ul class="nav navbar-nav navbar-right">
         <%if user_signed_in?%>

Halalan-trial/app/views/pages/index.html.erb

@@ -32,6 +32,7 @@
 							</tr>
 						<%end%>
 					</table>
+					<hr>
 			<%end%>
 		</div> 
 	</div>