Commit 3bf7a59a1c3e1174b5aceab9f6413d729fa470ec
1 parent
701166dc
Exists in
colab
and in
2 other branches
Turn footer into a grid
This improves the behaviour on small screen devices.
Showing
4 changed files
with
26 additions
and
27 deletions
Show diff stats
CHANGELOG.rdoc
| @@ -6,6 +6,7 @@ Prezento is the web interface for Mezuro. | @@ -6,6 +6,7 @@ Prezento is the web interface for Mezuro. | ||
| 6 | 6 | ||
| 7 | * Remove Show button for hotspot metric configurations | 7 | * Remove Show button for hotspot metric configurations |
| 8 | * Remove side menu | 8 | * Remove side menu |
| 9 | +* Refactor footer as a grid | ||
| 9 | 10 | ||
| 10 | == v0.11.3 - 01/04/2016 | 11 | == v0.11.3 - 01/04/2016 |
| 11 | 12 |
app/assets/stylesheets/bootstrap_and_overrides.css.less
| @@ -40,19 +40,6 @@ | @@ -40,19 +40,6 @@ | ||
| 40 | 40 | ||
| 41 | //@import "datepicker/datepicker"; | 41 | //@import "datepicker/datepicker"; |
| 42 | 42 | ||
| 43 | -footer div { | ||
| 44 | - width: 50%; | ||
| 45 | -} | ||
| 46 | - | ||
| 47 | -.footer-right { | ||
| 48 | - float: right; | ||
| 49 | - text-align: right; | ||
| 50 | -} | ||
| 51 | - | ||
| 52 | -.footer-left { | ||
| 53 | - float: left; | ||
| 54 | -} | ||
| 55 | - | ||
| 56 | #error_explanation { | 43 | #error_explanation { |
| 57 | background-color: #F2DEDE; | 44 | background-color: #F2DEDE; |
| 58 | border-color: #EED3D7; | 45 | border-color: #EED3D7; |
app/views/layouts/application.html.erb
| @@ -56,20 +56,18 @@ | @@ -56,20 +56,18 @@ | ||
| 56 | <%= yield %> | 56 | <%= yield %> |
| 57 | </div> | 57 | </div> |
| 58 | </div><!--/row--> | 58 | </div><!--/row--> |
| 59 | + </div> <!-- /container --> | ||
| 59 | 60 | ||
| 60 | - <%= render partial: 'shared/footer' %> | 61 | + <%= render partial: 'shared/footer' %> |
| 61 | 62 | ||
| 62 | - <script type="text/javascript"> | ||
| 63 | - $(function() { | ||
| 64 | - $( "#languages-accordion > div" ).accordion({ | ||
| 65 | - heightStyle: "content", | ||
| 66 | - collapsible: true, | ||
| 67 | - active: false | ||
| 68 | - }); | 63 | + <script type="text/javascript"> |
| 64 | + $(function() { | ||
| 65 | + $( "#languages-accordion > div" ).accordion({ | ||
| 66 | + heightStyle: "content", | ||
| 67 | + collapsible: true, | ||
| 68 | + active: false | ||
| 69 | }); | 69 | }); |
| 70 | - </script> | ||
| 71 | - | ||
| 72 | - </div> <!-- /container --> | ||
| 73 | - | 70 | + }); |
| 71 | + </script> | ||
| 74 | </body> | 72 | </body> |
| 75 | </html> | 73 | </html> |
app/views/shared/_footer.html.erb
| 1 | <footer> | 1 | <footer> |
| 2 | - <div class="footer-left">© <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2015</div> | ||
| 3 | - <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> | 2 | + <div class="container-fluid"> |
| 3 | + <div class="row"> | ||
| 4 | + <div class="col-md-7">© <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2015</div> | ||
| 5 | + <div class="col-md-5"> | ||
| 6 | + <div class="container-fluid"> | ||
| 7 | + <div class="row"> | ||
| 8 | + <div class="col-md-2"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %></div> | ||
| 9 | + <div class="col-md-2"><%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %></div> | ||
| 10 | + <div class="col-md-2"><%= image_tag 'usp-cloud-nuvem-logo.png' %></div> | ||
| 11 | + <div class="col-md-6"><%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div> | ||
| 12 | + </div> | ||
| 13 | + </div> | ||
| 14 | + </div> | ||
| 15 | + </div> | ||
| 16 | + </div> | ||
| 4 | </footer> | 17 | </footer> |