Skip to content

F
final_project
Commit c9cd83dc authored by Wills Gomez's avatar Wills Gomez
Browse files
Options

removed banner

parent 47918d06
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 20 deletions
Halalan-trial/app/assets/stylesheets/ver1.css.scss
View file @ c9cd83dc
...@@ -24,17 +24,4 @@ ul.nav navbar-nav navbar-right{ ...@@ -24,17 +24,4 @@ ul.nav navbar-nav navbar-right{
padding-top: 20px; padding-top: 20px;
} }
.banner{
width: 100%;
height: 300px;
display: block;
background-image: url(image-path('philippineflag2.jpg'));
}
.banner > .banner-image{
width: 100%;
height: 300px;
display: block;
background-image: url(image-path('philippineflag2.jpg'));
}
\ No newline at end of file
Halalan-trial/app/views/admin/candidates/index.html.erb
View file @ c9cd83dc
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<%@positions.each do |p|%> <%@positions.each do |p|%>
<hr> <hr>
<h3><center><%=p.name%></center></h3> <h3><center><%=p.name%></center></h3>
<<<<<<< HEAD
<table> <table>
<table class="table table-hover"> <table class="table table-hover">
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
<th witdth = "40%"><center>Name</center></th> <th witdth = "40%"><center>Name</center></th>
<th><center>Slogan</center></th> <th><center>Slogan</center></th>
</thead> </thead>
=======
<table> <table>
>>>>>>> a1448dc5a8392d3e8fd508db23a835cd0eab52ce
<%p.candidates.each do |c|%> <%p.candidates.each do |c|%>
<tr> <tr>
<td> <td>
......
Halalan-trial/app/views/pages/index.html.erb
View file @ c9cd83dc
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
<% provide(:title, "Home") %> <% provide(:title, "Home") %>
<div class="banner">
<img class="banner-image" src="images/philippineflag2.jpg">
</div>
<div class ="container"> <div class ="container">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment