Commit 8a1f0eab709f45aecad5494356bd30d303ce4459

Authored by Rafael Manzo
1 parent 88f276b1

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
@@ -13,6 +13,6 @@ @@ -13,6 +13,6 @@
13 <merge attributes="data-project-id" css:theme="body" css:content="body" /> 13 <merge attributes="data-project-id" css:theme="body" css:content="body" />
14 14
15 <drop css:content=".navbar" /> 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 </rules> 18 </rules>