added button styles and featured images for sections

parent 00d4a726
...@@ -38,7 +38,7 @@ gem 'simple_form' ...@@ -38,7 +38,7 @@ gem 'simple_form'
gem 'devise' gem 'devise'
group :production do group :production do
gem 'pg'
end end
group :development, :test do group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console # Call 'byebug' anywhere in the code to stop execution and get a debugger console
......
...@@ -89,7 +89,6 @@ GEM ...@@ -89,7 +89,6 @@ GEM
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7) pkg-config (~> 1.1.7)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.18.4)
pkg-config (1.1.7) pkg-config (1.1.7)
puma (3.4.0) puma (3.4.0)
rack (2.0.1) rack (2.0.1)
...@@ -177,7 +176,6 @@ DEPENDENCIES ...@@ -177,7 +176,6 @@ DEPENDENCIES
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
listen (~> 3.0.5) listen (~> 3.0.5)
pg
puma (~> 3.0) puma (~> 3.0)
rails (~> 5.0.0) rails (~> 5.0.0)
sass-rails (~> 5.0) sass-rails (~> 5.0)
......
This diff is collapsed.
...@@ -19,6 +19,7 @@ html, body { ...@@ -19,6 +19,7 @@ html, body {
} }
a { a {
color: #0070d2; color: #0070d2;
font-size: 16px;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: #16325c !important; color: #16325c !important;
...@@ -28,6 +29,7 @@ h1, h2, h3, h4, h5, h6 { ...@@ -28,6 +29,7 @@ h1, h2, h3, h4, h5, h6 {
.logo-container { .logo-container {
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: 10px;
} }
.main-heading { .main-heading {
...@@ -37,12 +39,13 @@ h1, h2, h3, h4, h5, h6 { ...@@ -37,12 +39,13 @@ h1, h2, h3, h4, h5, h6 {
.logo { .logo {
padding: 20px; padding: 20px;
} }
hr { hr {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
height: 1px; height: 0.5px;
background-color: rgb(250, 159, 187); background-color: rgb(250, 159, 187);
background-image: linear-gradient(to right, rgba(250, 159, 187, 0), rgb(191, 76, 118)); background-image: linear-gradient(to right, rgba(250, 159, 187, 0), rgb(191, 76, 118));
} }
...@@ -56,12 +59,18 @@ hr { ...@@ -56,12 +59,18 @@ hr {
padding:1em; padding:1em;
overflow: hidden; overflow: hidden;
border: 1px solid #e7e7e7; border: 1px solid #e7e7e7;
box-sizing: border-box;
} }
.nav a { .nav a {
position: relative; position: relative;
margin-right: 1em; margin-right: 1em;
color: #5E6B7F; color: #5E6B7F;
transition: 0.1s ease-in-out;
}
.nav a:hover {
color: #0070d2;
} }
.navigation-buttons { .navigation-buttons {
...@@ -84,7 +93,6 @@ hr { ...@@ -84,7 +93,6 @@ hr {
.actions { .actions {
margin-left: auto; margin-left: auto;
margin-right: 20px;
} }
...@@ -96,3 +104,32 @@ thead { ...@@ -96,3 +104,32 @@ thead {
border-radius: 50%; border-radius: 50%;
border: 1px #e7e7e7 solid; border: 1px #e7e7e7 solid;
} }
.pink {
background-color: #E5365F;
}
.pink:hover {
background-color: #DC1A47;
}
.row-image {
width: 100vw;
position: relative;
margin-left: -50vw;
/* margin-top: 100px; */
left: 50%;
margin-top: -40px;
margin-bottom: 40px;
/* top: -100px; */
background-size: cover !important;
}
.overlay {
background: linear-gradient(
rgba(20,20,20, .5),
rgba(20,20,20, .5));
}
<h4>Displaying All Candidates Grouped By Positions </h4> <div class="overlay"><div class="row-image" style="height: 400px; background: url(<%= asset_path 'image1.JPG' %>) center center"></div></div>
<h4>Roster of Candidates</h4>
<%=link_to new_admin_candidate_path, {:class =>"button-primary pink"} do%>
Add a Candidate &nbsp; <span class='ion-plus-round'></span>
<% end %>
<%=link_to "Add a Candidate", new_admin_candidate_path%>
<div class="container"> <div class="container">
<center> <center>
<% @positions.each do |p| %> <% @positions.each do |p| %>
<div style="display:inline-block; border:solid 1px; padding:30px; bottom:0; width:140px; margin:20px;"> <div style="display:inline-block; border:solid 1px; padding:30px; bottom:0; width:140px; margin:20px; url(<%= asset_path 'candidate.png' %>)">
<h5> <%= p.name %></h5> <h5> <%= p.name %></h5>
<ul > <ul >
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div class="navigation-buttons"> <div class="navigation-buttons">
<a href="/">Home</a> <a href="/"><span class="ion-home">&nbsp</span>Home</a>
<%= link_to "Candidates", admin_candidates_path,{ :class=>""} %> <%= link_to "Candidates", admin_candidates_path,{ :class=>""} %>
<%= link_to "Positions", admin_positions_path,{ :class=>""} %> <%= link_to "Positions", admin_positions_path,{ :class=>""} %>
...@@ -51,10 +51,11 @@ ...@@ -51,10 +51,11 @@
</div> </div>
<div class="actions"> <div class="actions">
<a class="button-primary" href="/voting/votes">Vote Now <span class="ion-ios-arrow-thin-right"></span></a> <a class="button-primary" href="/voting/votes">Vote Now <span class="ion-ios-arrow-thin-right"></span></a>
<%if user_signed_in?%> <%if user_signed_in?%>
<%= link_to "Logout", destroy_user_session_path,{ method: :delete,:class=>""} %> <%= link_to "Logout", destroy_user_session_path,{ method: :delete,:class=>""} %>
<span class=""> Hello <%= current_user.first_name%></span>
<a href="/profile" class="nav-item right">My Profile</a> <a href="/profile" class="nav-item right">My Profile</a>
<%else%> <%else%>
<%= link_to "Log-in", new_user_session_path, {:class =>""}%> <%= link_to "Log-in", new_user_session_path, {:class =>""}%>
......
<%if user_signed_in?%>
<h6 style="text-align: center; color: #8e8e8e !important; margin: 0px;">Welcome to the results page, <%= current_user.first_name%>.</h6>
<% end %>
<h3 class="main-heading">Election Results</h3> <h3 class="main-heading">Election Results</h3>
<hr> <hr>
<%@positions.each do |p|%> <%@positions.each do |p|%>
......
{"files":{"application-9893df45ee3bdaacc085af1efb0fa9eeeac21225cd1010b90afb613af8324d49.js":{"logical_path":"application.js","mtime":"2016-07-20T01:40:03+08:00","size":369870,"digest":"9893df45ee3bdaacc085af1efb0fa9eeeac21225cd1010b90afb613af8324d49","integrity":"sha256-mJPfRe472qzAha8e+w+p7urCEiXNEBC5CvthOvgyTUk="},"application-69cfe39669c7e026924f03c38bf8e27da58495e8b0869e7551d117a171edfb6e.css":{"logical_path":"application.css","mtime":"2016-07-20T01:13:16+08:00","size":13817,"digest":"69cfe39669c7e026924f03c38bf8e27da58495e8b0869e7551d117a171edfb6e","integrity":"sha256-ac/jlmnH4CaSTwPDi/jifaWEleiwhp51UdEXoXHt+24="}},"assets":{"application.js":"application-9893df45ee3bdaacc085af1efb0fa9eeeac21225cd1010b90afb613af8324d49.js","application.css":"application-69cfe39669c7e026924f03c38bf8e27da58495e8b0869e7551d117a171edfb6e.css"}}
\ No newline at end of file
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