Download as
Browse Code »

Commit 380a1960e0aa0491de493586a9e52d24d1beaf03

Authored by Fernando Brito
1 parent 573969df
Exists in master and in 2 other branches v2, wikilibras

Fix menu collapse and float

Showing 2 changed files with 20 additions and 9 deletions   Show diff stats
app/assets/stylesheets/bootstrap_overrides.css.scss
  Diff comments   View file @380a196
... ... @@ -43,4 +43,10 @@
43 43 }
44 44 .breadcrumb .active a {
45 45 color: #333333;
  46 +}
  47 +
  48 +@media (max-width: 767px) {
  49 + .nav-collapse.user-menu {
  50 + float: left;
  51 + }
46 52 }
47 53 \ No newline at end of file
... ...
app/views/layouts/_menu.haml
  Diff comments   View file @380a196
... ... @@ -2,6 +2,10 @@
2 2 .navbar-inner
3 3 .container-fluid
4 4 %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
  5 + .icon-bar
  6 + .icon-bar
  7 + .icon-bar
  8 +
5 9  
6 10 = link_to "GTAaaS", home_path, :class => "brand"
7 11  
... ... @@ -41,15 +45,16 @@
41 45 %li= link_to t('shared.about'), "http://gtaaas.lavid.ufpb.br/projeto", :target => "blank"
42 46  
43 47 - if current_user.present?
44   - %ul.nav.pull-right
45   - %li.dropdown
46   - %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
47   - = current_user.name
48   - %strong.caret
49   - %ul.dropdown-menu
50   - %li= link_to t('shared.edit'), ''
51   - %li.divider
52   - %li= link_to t('shared.logout'), destroy_user_session_path, :method => 'delete'
  48 + .nav-collapse.pull-right.user-menu
  49 + %ul.nav
  50 + %li.dropdown
  51 + %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
  52 + = current_user.name
  53 + %strong.caret
  54 + %ul.dropdown-menu
  55 + %li= link_to t('shared.edit'), ''
  56 + %li.divider
  57 + %li= link_to t('shared.logout'), destroy_user_session_path, :method => 'delete'
53 58  
54 59 /
55 60 <ul class="nav secondary-nav">
... ...