almost final

4d9f3c1c · royce-matthew · 83d56374 · 4d9f3c1c · 4d9f3c1c · 4d9f3c1c
Commit 4d9f3c1c authored Jul 19, 2016 by royce-matthew
7 changed files
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'jbuilder', '~> 2.5'

 gem 'simple_form'
 gem 'devise'
+gem "animate-rails"

 group :production do
 	gem 'pg'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,8 @@ GEM
      i18n (~> 0.7)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
+    animate-rails (1.0.10)
+      rails
    arel (7.0.0)
    bcrypt (3.1.11)
    builder (3.2.2)
@@ -171,6 +173,7 @@ PLATFORMS
  ruby

 DEPENDENCIES
+  animate-rails
  byebug
  coffee-rails (~> 4.2)
  devise

--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -9,7 +9,9 @@
 * 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.
 * It is generally better to create a new file per style scope.
- *
+*= require animate
+ 
 *= require_tree .
 *= require_self
 */
+*= require animate
\ No newline at end of file
--- a/app/assets/stylesheets/style.css
+++ b/app/assets/stylesheets/style.css
@@ -136,3 +136,19 @@ thead {
                     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
--- a/app/views/admin/candidates/index.html.erb
+++ b/app/views/admin/candidates/index.html.erb
@@ -10,13 +10,12 @@ Add a Candidate &nbsp; <span class='ion-plus-round'></span>

 <% end %>

-<div class="container"> 
-<center>
+<div class="candidate-container"> 
 <% @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  >
  <% p.candidates.each do |c|%>

@@ -28,5 +27,4 @@ Add a Candidate &nbsp; <span class='ion-plus-round'></span>
  </ul>
 </div>
 <% end %>
-</center>
 </div>
\ No newline at end of file
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -6,7 +6,7 @@
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= 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 rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
@@ -15,10 +15,7 @@


 </head>
-<body>
-
-
-
+<body class="bounceIn animated infinite">


 <nav class="nav">

--- a/app/views/pages/about.html.erb
+++ b/app/views/pages/about.html.erb
-<h1>hello world</h1>
\ No newline at end of file
+<h3>The A Team</h3>
+<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