Download as
Browse Code »

Commit 8a1f0eab709f45aecad5494356bd30d303ce4459

Authored by Rafael Manzo
1 parent 88f276b1
Exists in master and in 32 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, 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_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixed JS conflicts with Mezuro 

bootstrap js dropped from colab so the menus works
jquery js dropped from colab so accordion can load

Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
colab/plugins/mezuro/diazo.xml
  Diff comments   View file @8a1f0ea
... ... @@ -13,6 +13,6 @@
13 13 <merge attributes="data-project-id" css:theme="body" css:content="body" />
14 14  
15 15 <drop css:content=".navbar" />
16   - <!--<drop css:theme="script[src^='/static/third-party/bootstrap/css/bootstrap.min']" />
17   - <drop css:theme="script[src^='/static/third-party/jquery-2.0.3.min.js']" /> -->
  16 + <drop css:theme="script[src^='/static/third-party/bootstrap/js/bootstrap.min.js']" /> <!-- Fixes top menu -->
  17 + <drop css:theme="script[src^='/static/third-party/jquery-2.0.3.min.js']" /> <!-- Fixes accordion conflict --> <!--FIXME: if colab updates its jquery version this will break -->
18 18 </rules>
... ...