diff --git a/helpdesk/static/helpdesk/helpdesk-extend.css b/helpdesk/static/helpdesk/helpdesk-extend.css index 77826631..2d1d3b94 100644 --- a/helpdesk/static/helpdesk/helpdesk-extend.css +++ b/helpdesk/static/helpdesk/helpdesk-extend.css @@ -35,7 +35,9 @@ Bootstrap overrides .errorlist {padding: 0;} .has-error .input-group input, .has-error .input-group select, .has-error .input-group textarea {border-color: #b94a48} - +#helpdesk-nav-collapse #searchform { + padding-top: 0; +} /* Add your custom styles here @@ -46,6 +48,4 @@ Add your custom styles here padding: 10px 0; } #helpdesk-body {padding-top: 100px;} -#header .navbar-nav { - padding-top: 25px; -} \ No newline at end of file +img.brand {padding-right: 30px;} \ No newline at end of file diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index e385059b..2dea51f5 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -101,7 +101,8 @@
diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html index 20fcdaf2..1c9e4cbc 100644 --- a/helpdesk/templates/helpdesk/navigation.html +++ b/helpdesk/templates/helpdesk/navigation.html @@ -1,59 +1,74 @@ {% load i18n %}{% load url from future %} -{% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user.is_staff %} + -{% else %} - -{% endif %} \ No newline at end of file + + + \ No newline at end of file diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html index 0b778bc1..31743c96 100644 --- a/helpdesk/templates/helpdesk/public_base.html +++ b/helpdesk/templates/helpdesk/public_base.html @@ -4,7 +4,7 @@ {% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %} - + @@ -13,6 +13,7 @@
diff --git a/helpdesk/templates/helpdesk/registration/login.html b/helpdesk/templates/helpdesk/registration/login.html index da93ef86..a3cd2b2c 100644 --- a/helpdesk/templates/helpdesk/registration/login.html +++ b/helpdesk/templates/helpdesk/registration/login.html @@ -25,6 +25,6 @@
- + {% endif %} {% endblock %}