Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sat, 11 May 2019 23:19:37 UTC Commit: ddc9717e923786b0ee7fb4a85324c9f5b25bab8e https://github.com/geany/www.geany.org/commit/ddc9717e923786b0ee7fb4a85324c9...
Log Message: ----------- Fix navbar menu collapsing on small screens
Also fix a few styling issues on small screens in Pastebin.
Modified Paths: -------------- geany/templates/base.html pastebin/static/css/pastebin.css pastebin/templates/pastebin/base.html
Modified: geany/templates/base.html 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -4,9 +4,17 @@ {% block top_menu %} <div class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> - <img src="{% static "img/geany-36x36.png" %}" class="navbar-brand"> - <a class="navbar-brand" href="{% url "home" %}">Geany</a> - <div class="navbar-collapse collapse"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <img src="{% static "img/geany-36x36.png" %}" class="navbar-brand"> + <a href="{% url "home" %}" class="navbar-brand">Geany</a> + </div> + + <div class="navbar-collapse collapse" id="navbar"> {% page_menu "pages/menus/dropdown.html" %} </div> </div>
Modified: pastebin/static/css/pastebin.css 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -36,6 +36,8 @@ form.new-snippet-form { margin-bottom: 0px; width: auto; border: none; + background-color: inherit; /* overwrite the color set by .form-control */ + box-shadow: inherit; /* overwrite the shadow set by .form-control */ }
.new-snippet-form ul#id_expire_options li { @@ -114,6 +116,7 @@ div #snippet_list li { div #snippet_list a { text-decoration: none; width: 100%; + white-space: normal; } /* * Embedded snippet list
Modified: pastebin/templates/pastebin/base.html 41 lines changed, 25 insertions(+), 16 deletions(-) =================================================================== @@ -15,23 +15,32 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> - <img src="{% static "img/geany-36x36.png" %}" class="navbar-brand"> - <a class="navbar-brand" href="{% url "home" %}">Geany</a> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <img src="{% static "img/geany-36x36.png" %}" class="navbar-brand"> + <a href="{% url "home" %}" class="navbar-brand">Geany</a> + </div>
- <ul class="nav navbar-nav"> - <li class="{% if request.path == url_snippet_new %} active{% endif %}"> - <a href="{{ url_snippet_new }}">New snippet</a> - </li> - <li class="{% if request.path == url_help %} active{% endif %}"> - <a href="{{ url_help }}">Help</a> - </li> - <li class="{% if request.path == url_api %} active{% endif %}"> - <a href="{{ url_api }}">API</a> - </li> - <li class="{% if request.path == url_snippet_list %} active{% endif %}"> - <a href="{{ url_snippet_list }}">Recent snippets</a> - </li> - </ul> + <div class="navbar-collapse collapse" id="navbar"> + <ul class="nav navbar-nav" id="navbar"> + <li class="{% if request.path == url_snippet_new %} active{% endif %}"> + <a href="{{ url_snippet_new }}">New snippet</a> + </li> + <li class="{% if request.path == url_help %} active{% endif %}"> + <a href="{{ url_help }}">Help</a> + </li> + <li class="{% if request.path == url_api %} active{% endif %}"> + <a href="{{ url_api }}">API</a> + </li> + <li class="{% if request.path == url_snippet_list %} active{% endif %}"> + <a href="{{ url_snippet_list }}">Recent snippets</a> + </li> + </ul> + </div> </div> </div>
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).