Skip to content

[Fixes #69] Nav Toolbar Issue #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abulojoshua1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fixes #69] Nav Toolbar Issue #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions geonode/base/templates/base/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,15 @@
{% endif %}

{% endfor %}


<script type="text/javascript">
window.addEventListener("load", function(){
var reposition = function() {
const nav_bar_height = $("#navbar").height();
$("#wrap").css("margin-top", (nav_bar_height - 20));
$("#ms-container").css("top", nav_bar_height);
};
reposition();
// attach the function to the window resize event
$(window).resize(reposition);
});
</script>
14 changes: 12 additions & 2 deletions geonode/static/geonode/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6853,7 +6853,7 @@ body {
background: #333333;
font-family: 'Lato', sans-serif;
font-size: 16px;
padding-top: 60px;
padding-top: 0;
}
a {
color: #2c689c;
Expand Down Expand Up @@ -6900,6 +6900,7 @@ form input {
padding-bottom: 40px;
padding-top: 10px;
width: 100%;
margin-top: 60px;
}
article.tab-pane {
padding: 20px 0;
Expand All @@ -6925,6 +6926,9 @@ article.tab-pane {
background-color: #333333;
border: 0;
}
.navbar-inverse .nav-container {
margin: 0 2% 0 2%;
}
.navbar-inverse .navbar-nav > li > a {
color: white;
font-weight: 600;
Expand Down Expand Up @@ -7626,6 +7630,9 @@ nav.filter li a {
width: 480px;
}
@media (max-width: 991px) {
body {
padding-top: 70px;
}
#upload_form input[type="text"] {
width: 360px;
}
Expand Down Expand Up @@ -8177,7 +8184,7 @@ form-inline {
border-radius: 4px;
}
.home .geonode-slide-show .jumbotron {
padding: 4.5em 0 0 0;
padding: 0;
}
.home .geonode-slide-show .jumbotron:after {
background-image: none;
Expand Down Expand Up @@ -8248,3 +8255,6 @@ form-inline {
.iso-categories .row a:hover span {
background-color: black;
}
.jumbotron .gn-container {
margin-top: -2px;
}
16 changes: 14 additions & 2 deletions geonode/static/geonode/less/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ body {
background: @gray-dark;
font-family: @font-family-sans-serif;
font-size: @font-size-base;
padding-top: 60px;
padding-top: 0;
}

a {
Expand Down Expand Up @@ -102,6 +102,7 @@ form {
padding-bottom: 40px;
padding-top: 10px;
width: 100%;
margin-top: 60px;
}

article.tab-pane {
Expand Down Expand Up @@ -132,6 +133,10 @@ article.tab-pane {
background-color: @gray-dark;
border: 0;

.nav-container {
margin: 0 2% 0 2%;
}

.navbar-nav > li > a {
color: white;
font-weight: 600;
Expand Down Expand Up @@ -1031,6 +1036,10 @@ nav.filter {
}

@media (max-width: 991px) {
body {
padding-top: 70px;
}

#upload_form {
input[type="text"] {
width: 360px;
Expand Down Expand Up @@ -1706,7 +1715,7 @@ form-inline {
}

.home .geonode-slide-show .jumbotron {
padding: 4.5em 0 0 0;
padding: 0;
&:after {
background-image: none;
}
Expand Down Expand Up @@ -1776,3 +1785,6 @@ form-inline {
background-color: black;
}
}
.jumbotron .gn-container {
margin-top: -2px;
}
2 changes: 1 addition & 1 deletion geonode/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
<!-- Navbar -->
{% block header %}
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="nav-container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<i class="fa fa-navicon fa-lg"></i>
Expand Down
4 changes: 2 additions & 2 deletions geonode/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

{% if custom_theme.welcome_theme == 'JUMBOTRON_BG' or not slides %}
<div class="jumbotron">
<div class="container">
<div class="container gn-container">
{% with jumbotron_welcome_title=custom_theme.jumbotron_welcome_title|default:"Welcome"|template_trans %}
<h1>{% trans jumbotron_welcome_title %}</h1>
{% endwith %}
Expand All @@ -36,7 +36,7 @@ <h1>{% trans jumbotron_welcome_title %}</h1>
{% else %}
<div class="geonode-slide-show">
<div class="jumbotron jumbotron--no_bg">
<div class="container">
<div class="container gn-container">
<div id="myCarousel" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
{% if slides.count > 1%}
Expand Down