From ceeb61d845bb46b6621f2a2ab5bb94280dbcd953 Mon Sep 17 00:00:00 2001 From: Gust Date: Thu, 18 Dec 2014 14:54:24 -0200 Subject: [PATCH] Add content block to colab-style css --- colab/proxy/gitlab/templates/proxy/gitlab.html | 3 +++ colab/search/templates/search/search.html | 2 -- colab/static/third-party/bootstrap-colab/css/screen.css | 8 +------- colab/templates/base.html | 7 ++++++- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/colab/proxy/gitlab/templates/proxy/gitlab.html b/colab/proxy/gitlab/templates/proxy/gitlab.html index 1d55f9f..b47b688 100644 --- a/colab/proxy/gitlab/templates/proxy/gitlab.html +++ b/colab/proxy/gitlab/templates/proxy/gitlab.html @@ -49,3 +49,6 @@ {% endblock %} + + +{% block colab_bootstrap %}{% endblock %} diff --git a/colab/search/templates/search/search.html b/colab/search/templates/search/search.html index ede0e02..7c4bab6 100644 --- a/colab/search/templates/search/search.html +++ b/colab/search/templates/search/search.html @@ -41,7 +41,6 @@ We must use STATIC_URL because we have a language composing the URL {% endblock %} {% block main-content %} -

{% trans "Search" %}

@@ -160,6 +159,5 @@ We must use STATIC_URL because we have a language composing the URL {% endif %}
-
{% endblock %} diff --git a/colab/static/third-party/bootstrap-colab/css/screen.css b/colab/static/third-party/bootstrap-colab/css/screen.css index 75d4560..69d40cf 100644 --- a/colab/static/third-party/bootstrap-colab/css/screen.css +++ b/colab/static/third-party/bootstrap-colab/css/screen.css @@ -54,10 +54,4 @@ .colab-style .quiet { color: #999; font-size: 85%; -} -/* end of Fix user menu pop up */ - -/* Increase container margin because of noosfero pup ups */ -div#main-content { - margin-top: 100px; -} +} \ No newline at end of file diff --git a/colab/templates/base.html b/colab/templates/base.html index 36fa784..a5e2e2b 100644 --- a/colab/templates/base.html +++ b/colab/templates/base.html @@ -56,7 +56,10 @@ - + + +
+ {% if BROWSERID_ENABLED %} {% browserid_info %} {% endif %} @@ -236,5 +239,7 @@ {% endblock %} + +
-- libgit2 0.21.2