diff --git a/ckan/public/base/datapreview/resource.config b/ckan/public/base/datapreview/resource.config index 79376568802..4d68624c3b8 100644 --- a/ckan/public/base/datapreview/resource.config +++ b/ckan/public/base/datapreview/resource.config @@ -28,6 +28,7 @@ datapreview = vendor/recline/recline.js datapreview.js + vendor/bootstrap/2.0.3/bootstrap.css vendor/slickgrid/2.0.1/slick.grid.css vendor/leaflet/0.4.4/leaflet.css diff --git a/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css b/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css similarity index 100% rename from ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css rename to ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css diff --git a/ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png b/ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png new file mode 100644 index 00000000000..79bc568c213 Binary files /dev/null and b/ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png differ diff --git a/ckan/templates/base.html b/ckan/templates/base.html index 9073de45052..537bc07d4b9 100644 --- a/ckan/templates/base.html +++ b/ckan/templates/base.html @@ -10,7 +10,6 @@ {%- endblock -%} -{% resource g.main_css[6:] %} {# Allows custom attributes to be added to the tag #} {# @@ -70,17 +69,21 @@ {% endblock %} #} {%- block styles %} + {% resource g.main_css[6:] %} {% endblock %} {# defined in the config.ini under "ckan.template_head_end" #} {% block head_extras %} {{ config.get('ckan.template_head_end', '') | safe }} {% endblock %} - {%- if g.site_custom_css -%} - - {%- endif %} + + {%- block custom_styles %} + {%- if g.site_custom_css -%} + + {%- endif %} + {% endblock %} {# Allows custom attributes to be added to the tag #} diff --git a/ckan/templates/package/resource_preview.html b/ckan/templates/package/resource_preview.html index 6869ce5a7af..ac986f362a7 100644 --- a/ckan/templates/package/resource_preview.html +++ b/ckan/templates/package/resource_preview.html @@ -16,3 +16,11 @@ var preload_resource = {{ h.literal(c.resource_json) }}; {% endblock %} + + +{# remove any ckan styles #} +{% block styles %} +{% endblock %} + +{% block custom_styles %} +{% endblock %}