diff --git a/mayan/apps/appearance/static/appearance/css/base.css b/mayan/apps/appearance/static/appearance/css/base.css index 57b1e9a7cb..efc80af7d1 100644 --- a/mayan/apps/appearance/static/appearance/css/base.css +++ b/mayan/apps/appearance/static/appearance/css/base.css @@ -435,23 +435,56 @@ a i { /* Hide for mobile, show later */ #menu-main { - display: none; + display: block; background-color: #2c3e50; border-right: 1px solid #18bc9c; bottom: 0; - left: 0; + left: -210px; overflow-x: hidden; overflow-y: auto; padding-top: 10px; position: fixed; top: 51px; + transition: left 0.3s; width: 210px; z-index: 1000; + +} + +#menu-main-button-close { + border-radius: 0; + border-top: 2px solid #1c2733; + border-bottom: 2px solid #1c2733; + bottom: 0; + display: block; + height: 40px; + position: relative; + text-align: center; + width: 209px; +} + +#main-menu-button-open { + background-color: transparent; + border: 0; + border-right: 1px solid #95a5a6; + display: block; + padding: 6px 20px 0px 10px; + margin: 0 10px 0 -15px; } @media (min-width: 768px) { #menu-main { display: block; + left: 0; + } + + #menu-main-button-close { + display: none; + } + + #main-menu-button-open { + display: none; + } .navbar-brand { @@ -460,6 +493,11 @@ a i { } } +.menu-main-opened { + display: block !important; + left: 0 !important; +} + .main .page-header { margin-top: 0; } diff --git a/mayan/apps/appearance/static/appearance/js/mayan_app.js b/mayan/apps/appearance/static/appearance/js/mayan_app.js index ed8515162f..3bd4477fc1 100644 --- a/mayan/apps/appearance/static/appearance/js/mayan_app.js +++ b/mayan/apps/appearance/static/appearance/js/mayan_app.js @@ -305,6 +305,16 @@ class MayanApp { $('.navbar-collapse').collapse('hide'); } }); + + // Small screen main menu toggle to open + $('body').on('click', '#main-menu-button-open', function (event) { + $('#menu-main').addClass('menu-main-opened'); + }); + + // Small screen main menu toggle to close + $('body').on('click', '#menu-main-button-close', function (event) { + $('#menu-main').removeClass('menu-main-opened'); + }); } setupNewWindowAnchor () { diff --git a/mayan/apps/appearance/templates/appearance/calculate_form_title.html b/mayan/apps/appearance/templates/appearance/calculate_form_title.html index 6c96b8c40a..6a3fd5e6ff 100644 --- a/mayan/apps/appearance/templates/appearance/calculate_form_title.html +++ b/mayan/apps/appearance/templates/appearance/calculate_form_title.html @@ -5,13 +5,31 @@ {% common_calculate_title as result %} {% if not non_html_title %} -
+ {{ subtitle }} +
+ {% endif %} +{% endif %} + +{% if not non_html_title %} +