Merge pull request #46 from hugodias/dev

Removed useless code in dashboard and added footer
hugodias · Apr 30, 2016 · a107958 · a107958
2 parents 67605bf + c65daa1
commit a107958
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss
@@ -5,7 +5,7 @@
 }
 
 .main {
-  padding: 50px 20px;
+  padding: 50px 0;
 
   .page-header {
     margin-top: 0;
@@ -16,13 +16,6 @@
   }
 }
 
-@media (min-width: 768px) {
-  .main {
-    padding-right: 40px;
-    padding-left: 40px;
-  }
-}
-
 .stats {
   margin-bottom: 30px;
   text-align: center;

diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
@@ -1,3 +1,4 @@
+
 <div class="row stats">
   <div class="col-xs-12 col-sm-4 stat">
     <div class="card">
@@ -24,6 +25,8 @@
     </div>
   </div>
 </div>
+
+
 <h2 class="sub-header">Aguardando aprovação</h2>
 
 <div class="card">

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,8 @@
+<footer class="footer">
+  <div class="container">
+    <p class="text-muted pull-left">© 2016 San Pedro Valley Jobs </p>
+
+    <p class="text-muted pull-right">Fork me on <a href="https://github.com/hugodias/san-pedro-valley-jobs" class="link-accent" target="_blank">Github</a>!</p>
+    <div class="clearfix"></div>
+  </div>
+</footer>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -14,13 +14,6 @@
       <%= render 'layouts/navigation' %>
       <div class="clearfix"></div>
      	<%= yield %>
-      <footer class="footer">
-        <div class="container">
-          <p class="text-muted pull-left">© 2016 San Pedro Valley Jobs </p>
-
-          <p class="text-muted pull-right">Fork me on <a href="https://github.com/hugodias/san-pedro-valley-jobs" class="link-accent" target="_blank">Github</a>!</p>
-          <div class="clearfix"></div>
-        </div>
-      </footer>
+      <%= render 'layouts/footer' %>
     </body>
   </html>
diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb
@@ -13,13 +13,12 @@
   <body class="<%= curr_page %>">
     <%= render 'layouts/messages' %>
     <%= render 'layouts/navigation' %>
+    <div class="clearfix"></div>
     <div class="container">
-      <div class="row">
-        <div class="col-md-12 main">
-
-          <%= yield %>
-        </div>
+      <div class="main">
+        <%= yield %>
       </div>
     </div>
+    <%= render 'layouts/footer' %>
   </body>
 </html>