From 69ad8b90000bdb821e023168eddd778c4b752116 Mon Sep 17 00:00:00 2001 From: Alec Perkins Date: Sun, 9 Sep 2012 15:54:50 -0400 Subject: [PATCH] Inverse, fixed navbar. Block for easily modifying navbar style. --- .../css/bootstrap-tweaks.css | 8 ++++++++ .../static/djangorestframework/css/style.css | 10 +++++++++- .../templates/djangorestframework/base.html | 18 ++++++++++-------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/djangorestframework/static/djangorestframework/css/bootstrap-tweaks.css b/djangorestframework/static/djangorestframework/css/bootstrap-tweaks.css index f80b312a5..eb41649e2 100644 --- a/djangorestframework/static/djangorestframework/css/bootstrap-tweaks.css +++ b/djangorestframework/static/djangorestframework/css/bootstrap-tweaks.css @@ -10,4 +10,12 @@ a single block in the template. .form-actions { background: transparent; border-top-color: transparent; +} + +.navbar-inverse .brand a { + color: #999; +} +.navbar-inverse .brand:hover a { + color: white; + text-decoration: none; } \ No newline at end of file diff --git a/djangorestframework/static/djangorestframework/css/style.css b/djangorestframework/static/djangorestframework/css/style.css index 2d937be43..6430f670c 100644 --- a/djangorestframework/static/djangorestframework/css/style.css +++ b/djangorestframework/static/djangorestframework/css/style.css @@ -1,8 +1,16 @@ body { - padding-top: 1em; + padding-top: 0; padding-bottom: 1em; } +/* The navbar is fixed at >= 980px wide, so add padding to the body to prevent +content running up underneath it. */ +@media (min-width:980px) { + body { + padding-top: 60px; + } +} + h1 { font-weight: 500; } diff --git a/djangorestframework/templates/djangorestframework/base.html b/djangorestframework/templates/djangorestframework/base.html index 993d82486..fa9a114a1 100644 --- a/djangorestframework/templates/djangorestframework/base.html +++ b/djangorestframework/templates/djangorestframework/base.html @@ -27,11 +27,12 @@ -
+
- - {% block branding %}Django REST framework {{ version }}{% endblock %} - +
+ + {% block branding %}Django REST framework {{ version }}{% endblock %} +
    {% block userlinks %} {% if user.is_active %} @@ -49,10 +50,11 @@ {% endif %} {% endblock %}
+
- {% block nav-global %}{% endblock %} + {% block global_heading %}{% endblock %} {% block breadcrumbs %} @@ -73,9 +75,9 @@
- GET + GET -
    @@ -97,7 +99,7 @@ {% csrf_token %} - + {% if not 'OPTIONS' in allowed_methods %}
    {% endif %}