Download as
Browse Code »

Commit 5e440bce80c185e59a9e890bb037bd865acc90d7

Authored by Sergio Oliveira
2 parents 14ae154a f4ac92ac
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'noosfero-integration' into 'master' 

Fixed noosfero CSS again
Showing 2 changed files with 9 additions and 12 deletions   Show diff stats
colab/proxy/noosfero/diazo.xml
  Diff comments   View file @5e440bc
@@ -8,10 +8,9 @@ @@ -8,10 +8,9 @@
8 8
9 <merge attributes="class" css:theme="body" css:content="body" /> 9 <merge attributes="class" css:theme="body" css:content="body" />
10 10
11 - <drop css:theme="link[href='/static/third-party/font-awesome/css/font-awesome.min.css']" />  
12 - <drop css:theme="link[href='/static/converse.js/converse.min.css']" />  
13 - <drop css:theme="link[href='/static/third-party/bootstrap/css/bootstrap.min.css']" />  
14 - <drop css:theme="link[href='/static/css/screen.css']" /> 11 + <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" />
  12 + <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" />
  13 + <drop css:theme="link[href^='/static/css/screen']" />
15 <drop theme="/html/head/script" /> 14 <drop theme="/html/head/script" />
16 <drop css:content="#barra-brasil" /> 15 <drop css:content="#barra-brasil" />
17 <drop css:content="#user" /> 16 <drop css:content="#user" />
colab/proxy/noosfero/templates/proxy/noosfero.html
  Diff comments   View file @5e440bc
@@ -2,12 +2,10 @@ @@ -2,12 +2,10 @@
2 {% load static from staticfiles %} 2 {% load static from staticfiles %}
3 3
4 {% block head_css %} 4 {% block head_css %}
5 -<link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}"  
6 - media="screen, projection" rel="stylesheet" type="text/css">  
7 -<link href="{% static 'noosfero/css/screen.css' %}" media="screen, projection" rel="stylesheet" type="text/css">  
8 -<style>  
9 -  
10 -</style> 5 + <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}"
  6 + media="screen, projection" rel="stylesheet" type="text/css">
  7 + <link href="{% static 'noosfero/css/screen.css' %}"
  8 + media="screen, projection" rel="stylesheet" type="text/css">
11 {% endblock %} 9 {% endblock %}
12 10
13 {% block navbar %} 11 {% block navbar %}
@@ -24,6 +22,6 @@ @@ -24,6 +22,6 @@
24 22
25 {% block footer_js %} 23 {% block footer_js %}
26 {{ block.super }} 24 {{ block.super }}
27 -<script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script>  
28 -<script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script> 25 + <script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script>
  26 + <script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script>
29 {% endblock %} 27 {% endblock %}