Download as
Browse Code »

Commit ceeb61d845bb46b6621f2a2ab5bb94280dbcd953

Authored by Gust
1 parent a72b698f

Add content block to colab-style css 

- The 'content' div is the parent of all divs so if colab-style is above
  it, all it's children will inhert from colab-style and not other
  bootstraps, therefore, the block colab_bootstrap were added to remove the topmost colab-style div and let the proxy use
  their respective bootstrap instead.
Showing 4 changed files with 10 additions and 10 deletions   Show diff stats
colab/proxy/gitlab/templates/proxy/gitlab.html
  Diff comments   View file @ceeb61d
@@ -49,3 +49,6 @@ @@ -49,3 +49,6 @@
49 <script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script> 49 <script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script>
50 <script>jQuery.noConflict();</script> 50 <script>jQuery.noConflict();</script>
51 {% endblock %} 51 {% endblock %}
  52 +
  53 +<!-- removes the 'colab-style' div and lets the bootstrap from gitlab handle it -->
  54 +{% block colab_bootstrap %}{% endblock %}
colab/search/templates/search/search.html
  Diff comments   View file @ceeb61d
@@ -41,7 +41,6 @@ We must use STATIC_URL because we have a language composing the URL @@ -41,7 +41,6 @@ We must use STATIC_URL because we have a language composing the URL
41 {% endblock %} 41 {% endblock %}
42 42
43 {% block main-content %} 43 {% block main-content %}
44 -<div class="colab-style">  
45 <div class="row"> 44 <div class="row">
46 <div class="col-xs-6 col-sm-4 col-md-2 col-lg-2"> 45 <div class="col-xs-6 col-sm-4 col-md-2 col-lg-2">
47 <h2>{% trans "Search" %}</h2> 46 <h2>{% trans "Search" %}</h2>
@@ -160,6 +159,5 @@ We must use STATIC_URL because we have a language composing the URL @@ -160,6 +159,5 @@ We must use STATIC_URL because we have a language composing the URL
160 {% endif %} 159 {% endif %}
161 </div> 160 </div>
162 161
163 - </div>  
164 </div> 162 </div>
165 {% endblock %} 163 {% endblock %}
colab/static/third-party/bootstrap-colab/css/screen.css
  Diff comments   View file @ceeb61d
@@ -54,10 +54,4 @@ @@ -54,10 +54,4 @@
54 .colab-style .quiet { 54 .colab-style .quiet {
55 color: #999; 55 color: #999;
56 font-size: 85%; 56 font-size: 85%;
57 -}  
58 -/* end of Fix user menu pop up */  
59 -  
60 -/* Increase container margin because of noosfero pup ups */  
61 -div#main-content {  
62 - margin-top: 100px;  
63 -} 57 +}
64 \ No newline at end of file 58 \ No newline at end of file
colab/templates/base.html
  Diff comments   View file @ceeb61d
@@ -56,7 +56,10 @@ @@ -56,7 +56,10 @@
56 </head> 56 </head>
57 57
58 <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab --> 58 <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
59 - <body class="container" data-no-turbolink> 59 + <body class="{% block colab_bootstrap %}colab-style{% endblock %}" data-no-turbolink>
  60 +
  61 + <div class="container">
  62 +
60 {% if BROWSERID_ENABLED %} 63 {% if BROWSERID_ENABLED %}
61 {% browserid_info %} 64 {% browserid_info %}
62 {% endif %} 65 {% endif %}
@@ -236,5 +239,7 @@ @@ -236,5 +239,7 @@
236 <script src="{% static 'third-party/bootstrap-colab/js/jquery.dropdown.js' %}" type="text/javascript"></script> 239 <script src="{% static 'third-party/bootstrap-colab/js/jquery.dropdown.js' %}" type="text/javascript"></script>
237 <script src="{% static 'third-party/bootstrap-colab/js/collapse.js' %}" type="text/javascript"></script> 240 <script src="{% static 'third-party/bootstrap-colab/js/collapse.js' %}" type="text/javascript"></script>
238 {% endblock %} 241 {% endblock %}
  242 +
  243 + </div>
239 </body> 244 </body>
240 </html> 245 </html>