Skip to content

C
candi-date-tayo
Commit 4d9f3c1c authored by royce-matthew's avatar royce-matthew
Browse files
Options

almost final

parent 83d56374
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 12 deletions
Gemfile
View file @ 4d9f3c1c
...@@ -36,6 +36,7 @@ gem 'jbuilder', '~> 2.5' ...@@ -36,6 +36,7 @@ gem 'jbuilder', '~> 2.5'
gem 'simple_form' gem 'simple_form'
gem 'devise' gem 'devise'
gem "animate-rails"
group :production do group :production do
gem 'pg' gem 'pg'
......
Gemfile.lock
View file @ 4d9f3c1c
...@@ -38,6 +38,8 @@ GEM ...@@ -38,6 +38,8 @@ GEM
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
animate-rails (1.0.10)
rails
arel (7.0.0) arel (7.0.0)
bcrypt (3.1.11) bcrypt (3.1.11)
builder (3.2.2) builder (3.2.2)
...@@ -171,6 +173,7 @@ PLATFORMS ...@@ -171,6 +173,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
animate-rails
byebug byebug
coffee-rails (~> 4.2) coffee-rails (~> 4.2)
devise devise
......
app/assets/stylesheets/application.css
View file @ 4d9f3c1c
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
* files in this directory. Styles in this file should be added after the last require_* statement. * files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope. * It is generally better to create a new file per style scope.
* *= require animate
*= require_tree . *= require_tree .
*= require_self *= require_self
*/ */
*= require animate
\ No newline at end of file
app/assets/stylesheets/style.css
View file @ 4d9f3c1c
...@@ -136,3 +136,19 @@ thead { ...@@ -136,3 +136,19 @@ thead {
rgba(20,20,20, .5)); rgba(20,20,20, .5));
} }
.candidate-container {
display: flex;
align-items: stretch;
margin-top: 40px;
}
.candidate-item {
background: #f6f9fb; padding:30px; bottom:0; width:140px; margin-right:20px;
min-width: 200px;
}
.candidate-name {
font-size: 32px;
}
\ No newline at end of file
app/views/admin/candidates/index.html.erb
View file @ 4d9f3c1c
...@@ -10,13 +10,12 @@ Add a Candidate &nbsp; <span class='ion-plus-round'></span> ...@@ -10,13 +10,12 @@ Add a Candidate &nbsp; <span class='ion-plus-round'></span>
<% end %> <% end %>
<div class="container"> <div class="candidate-container">
<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; url(<%= asset_path 'candidate.png' %>)"> <div class="candidate-item">
<h5> <%= p.name %></h5> <h5 class="candidate-name"> <%= p.name %></h5>
<ul > <ul >
<% p.candidates.each do |c|%> <% p.candidates.each do |c|%>
...@@ -28,5 +27,4 @@ Add a Candidate &nbsp; <span class='ion-plus-round'></span> ...@@ -28,5 +27,4 @@ Add a Candidate &nbsp; <span class='ion-plus-round'></span>
</ul> </ul>
</div> </div>
<% end %> <% end %>
</center>
</div> </div>
\ No newline at end of file
app/views/layouts/application.html.erb
View file @ 4d9f3c1c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<link rel="stylesheet" href="https://s.mlcdn.co/animate.css">
<link href='https://fonts.googleapis.com/css?family=Roboto:300,100,400' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:300,100,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
...@@ -15,10 +15,7 @@ ...@@ -15,10 +15,7 @@
</head> </head>
<body> <body class="bounceIn animated infinite">
<nav class="nav"> <nav class="nav">
......
app/views/pages/about.html.erb
View file @ 4d9f3c1c
<h1>hello world</h1> <h3>The A Team</h3>
\ No newline at end of file <h5>Royce Matthew Chan</h5>
<h4>Full-Stack Developer</h4>
<h5>Alexander Hans Collado Jr.</h5>
<h5>George Balmaceda</h5>
<h5>Travis Munoz</h5>
\ 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