Skip to content
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

Jump to bottom

Revert "#666: Make navdrawer collapsible in large resolution" #718

Merged
merged 2 commits into from
Dec 20, 2019
Merged

Revert "#666: Make navdrawer collapsible in large resolution" #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2cb615
Revert "#666: Make navdrawer collapsible in large resolution"
alexlittle Dec 20, 2019
078f7fb
Merge branch '0.12.3' into revert-693-issue-666
alexlittle Dec 20, 2019
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
39 changes: 3 additions & 36 deletions static/css/components/_navdrawer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,17 @@
.navdrawer-permanent-lg {
z-index: map-get($navdrawer-elevation-shadow, elevation);
}
.navdrawer-permanent-lg.show + #main-content{
margin-left:0;
.navdrawer-permanent-lg + #main-content, .navbar-drawer .container{
margin-left:$navdrawer-width;
}

.navdrawer-open-default #main-content .modal.show,
.navdrawer-open-default .navbar-drawer{
padding-left:$navdrawer-width;
transition-duration: .225s;
transition-property: padding-left;
transition-timing-function: cubic-bezier(0,0,.2,1);
}

.navdrawer-persistent-lg + #main-content{
margin-left: 0;
transition-duration: .225s;
transition-property: margin-left;
transition-timing-function: cubic-bezier(0,0,.2,1);
}

.navdrawer-open-default #main-content{
margin-left: $navdrawer-width;
}

.navdrawer-persistent-lg.show + #main-content .modal.show{
.navdrawer-permanent-lg + #main-content .modal.show{
padding-left:$navdrawer-width;
}

.navdrawer-backdrop {
top:auto;
right:auto;
left:auto;
}



}
.navdrawer-permanent-lg ~ #top-bar{
margin-left:$navdrawer-width;
}

.navbar-toggler.always-show{
display:block;
}

@media (max-width: 992px){
.navbar-toggler.always-show{
display:block;
Expand Down
3 changes: 0 additions & 3 deletions static/oppia/js/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
$(function(){
$('[data-toggle="tooltip"]').tooltip();
if ($('.device-lg').css('display') == 'block'){
$('.navdrawer-persistent-lg').navdrawer('show')
}

initElems($('body'));
});
Expand Down
4 changes: 3 additions & 1 deletion templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

</head>

<body class="d-flex flex-column navdrawer-open-default" {% block extra_body %}{% endblock extra_body %}>
<body class="d-flex flex-column" {% block extra_body %}{% endblock extra_body %}>

{% if DEBUG %}
<div class="fixed-bottom alert alert-danger alert-dismissable debug-alert" style="z-index:200;">
Expand Down Expand Up @@ -76,8 +76,10 @@
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
<script src="{% static 'oppia/js/material.min.js' %}"></script>

<script src="{% static 'oppia/js/common.js' %}?v=3"></script>


{% block extra_scripts %}
{% endblock extra_scripts %}

Expand Down
8 changes: 5 additions & 3 deletions templates/includes/navbar_superuser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
{% load i18n %}

<nav class="navbar navbar-expand navbar-light bg-primary navbar-drawer" id="top-bar">
<button class="navbar-toggler always-show" type="button" data-toggle="navdrawer" data-target="#doc-navdrawer" aria-controls="doc-navdrawer" aria-label="Toggle navigation">
<div class="container">
<button class="navbar-toggler always-show" type="button" data-toggle="navdrawer" data-target="#doc-navdrawer" aria-controls="doc-navdrawer" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand text-light" href="{% url 'oppia_home' %}"><img class="mr-2" src="{% static "oppia/images/dc_logo.png" %}" height="30" alt="{% trans 'app_name' %} {% trans 'logo' %}"/>{% trans 'app_name' %}</a>
<div class="device-lg d-none d-lg-block"></div>


<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="navbar-nav ml-auto mt-0">
Expand All @@ -30,10 +31,11 @@
</li>
</ul>
</div>
</div>
</nav>


<div class="navdrawer navdrawer-persistent-lg navdrawer-default show" id="doc-navdrawer" tabindex="-1">
<div class="navdrawer navdrawer-permanent-lg doc-navdrawer" id="doc-navdrawer" tabindex="-1" aria-hidden="true">
<div class="navdrawer-content">
<div class="d-flex flex-column doc-navdrawer-body">

Expand Down