From 3bf7a59a1c3e1174b5aceab9f6413d729fa470ec Mon Sep 17 00:00:00 2001
From: Rafael Reggiani Manzo <rr.manzo@protonmail.com>
Date: Wed, 13 Apr 2016 16:04:38 -0300
Subject: [PATCH] Turn footer into a grid

---
 CHANGELOG.rdoc                                          |  1 +
 app/assets/stylesheets/bootstrap_and_overrides.css.less | 13 -------------
 app/views/layouts/application.html.erb                  | 22 ++++++++++------------
 app/views/shared/_footer.html.erb                       | 17 +++++++++++++++--
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 15e7093..d214d7f 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -6,6 +6,7 @@ Prezento is the web interface for Mezuro.
 
 * Remove Show button for hotspot metric configurations
 * Remove side menu
+* Refactor footer as a grid
 
 == v0.11.3 - 01/04/2016
 
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 588c82e..99d1a58 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -40,19 +40,6 @@
 
 //@import "datepicker/datepicker";
 
-footer div {
-  width: 50%;
-}
-
-.footer-right {
-  float: right;
-  text-align: right;
-}
-
-.footer-left {
-  float: left;
-}
-
 #error_explanation {
   background-color: #F2DEDE;
   border-color: #EED3D7;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b5811c4..1172365 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -56,20 +56,18 @@
           <%= yield %>
         </div>
       </div><!--/row-->
+    </div> <!-- /container -->
 
-      <%= render partial: 'shared/footer' %>
+    <%= render partial: 'shared/footer' %>
 
-      <script type="text/javascript">
-        $(function() {
-          $( "#languages-accordion > div" ).accordion({
-            heightStyle: "content",
-            collapsible: true,
-            active: false
-          });
+    <script type="text/javascript">
+      $(function() {
+        $( "#languages-accordion > div" ).accordion({
+          heightStyle: "content",
+          collapsible: true,
+          active: false
         });
-      </script>
-
-    </div> <!-- /container -->
-
+      });
+    </script>
   </body>
 </html>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 4413e36..0a2fc40 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,4 +1,17 @@
 <footer>
-  <div class="footer-left">&copy; <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2015</div>
-  <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-7">&copy; <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2015</div>
+      <div class="col-md-5">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-2"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %></div>
+            <div class="col-md-2"><%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %></div>
+            <div class="col-md-2"><%= image_tag 'usp-cloud-nuvem-logo.png' %></div>
+            <div class="col-md-6"><%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </footer>
--
libgit2 0.21.2