diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/_navigation.html.erb | 50 | ||||
| -rw-r--r-- | source/stylesheets/base.css.scss | 8 | 
2 files changed, 39 insertions, 19 deletions
| diff --git a/source/_navigation.html.erb b/source/_navigation.html.erb index bf5b556..c0e3148 100644 --- a/source/_navigation.html.erb +++ b/source/_navigation.html.erb @@ -33,28 +33,40 @@  }  %> -<ul> -  <li class="dropdown"> -    <%= link_to "Home", "/" %> -  </li> +<div class="navbar-header"> +  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#nav-big"> +    <span class="sr-only">Toggle navigation</span> +    <span class="icon-bar"></span> +    <span class="icon-bar"></span> +    <span class="icon-bar"></span> +  </button> +</div> + +<div class="collapse navbar-collapse" id="nav-big"> +  <ul> -  <% @navigation.each do |key, value| %>      <li class="dropdown"> -      <a data-toggle="dropdown" class="dropdown-toggle" href=<%= key.last %>> -        <%= key.first %> +      <%= link_to "Home", "/" %> +    </li> + +    <% @navigation.each do |key, value| %> +      <li class="dropdown"> +        <a data-toggle="dropdown" class="dropdown-toggle" href=<%= key.last %>> +          <%= key.first %> +          <% if value %> +            <b class="caret"></b> +          <% end %> +        </a>          <% if value %> -          <b class="caret"></b> +          <ul class="dropdown-menu"> +            <% value.each do |name, url| %> +              <li><%= link_to(name, url) %></li> +            <% end %> +          </ul>          <% end %> -      </a> -      <% if value %> -        <ul class="dropdown-menu"> -          <% value.each do |name, url| %> -            <li><%= link_to(name, url) %></li> -          <% end %> -        </ul> -      <% end %> -    </li> -  <% end %> +      </li> +    <% end %> -</ul> +  </ul> +</div> diff --git a/source/stylesheets/base.css.scss b/source/stylesheets/base.css.scss index a38b784..99db24d 100644 --- a/source/stylesheets/base.css.scss +++ b/source/stylesheets/base.css.scss @@ -10,12 +10,18 @@ body {  nav {    @extend .row; +  @extend .navbar; +  @extend .navbar-static; +  @extend .navbar-inverse;  }  nav ul {    @extend .nav;    @extend .navbar-nav;    @extend .navbar-justified; + +  //@extend .collapse; +  //@extend .navbar-collapse;  }  @media (min-width: 768px){ @@ -27,7 +33,9 @@ nav ul {    }  } +/*  ul.nav li.dropdown:hover ul.dropdown-menu{    display: block;    margin-top:0px  } +*/ | 
