Commit 2acd8c5a by Clinton Blackburn

Navbar Updates

- Navigation is no longer fixed to the top of the window
- Lens navigation only appears when there are actually items to display
parent 0ac06568
...@@ -55,6 +55,11 @@ hr.has-emphasis { ...@@ -55,6 +55,11 @@ hr.has-emphasis {
// nav + header // nav + header
// -------------------- // --------------------
.navbar {
margin-bottom: 0; // Get rid of Bootstrap's default margin. Many of our pages have a secondary navbar
// that needs to sit right below the main navbar.
}
.navbar-brand { .navbar-brand {
padding: 25px 50px; // needed for edX logo to render properly padding: 25px 50px; // needed for edX logo to render properly
...@@ -308,8 +313,6 @@ hr.has-emphasis { ...@@ -308,8 +313,6 @@ hr.has-emphasis {
// view: dashboard // view: dashboard
// -------------------- // --------------------
.view-dashboard { .view-dashboard {
padding-top: $navbar-height; // move down content because we have a fixed navbar
.main { .main {
padding: ($padding-large-vertical*2) ($padding-large-horizontal*3); padding: ($padding-large-vertical*2) ($padding-large-horizontal*3);
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Partial: App-wide header element Partial: App-wide header element
{% endcomment %} {% endcomment %}
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="nav"> <nav class="navbar navbar-default" role="navigation" id="nav">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-nav"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-nav">
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Partial for displaying the lens navigation and the sections within the lenses. Partial for displaying the lens navigation and the sections within the lenses.
{% endcomment %} {% endcomment %}
{% if primary_nav_items %}
<nav class="navbar navbar-default lens-nav" role="navigation"> <nav class="navbar navbar-default lens-nav" role="navigation">
<div class="container "> <div class="container ">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
...@@ -34,3 +35,4 @@ Partial for displaying the lens navigation and the sections within the lenses. ...@@ -34,3 +35,4 @@ Partial for displaying the lens navigation and the sections within the lenses.
</ul> </ul>
</div> </div>
</nav> </nav>
{% endif %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment