Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Compartmentalise icekit's bower deps #307

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from

Conversation

markfinger
Copy link
Member

@markfinger markfinger commented Oct 31, 2017

Re: #286

The intention here is to keep all of icekit's deps within icekit itself, so that the project can define common url paths ("bootstrap/...", for example) without impacting on the admin's functionality.

Basically, we're using a .bowerrc file that tells bower to install all of the deps into a icekit/bower_components dir within icekit's static dir. All of the asset references have been updated to target that directory.

<link rel="stylesheet" href="{% static 'admin/css/base.css' %}" />
<link type="text/less" rel="stylesheet" href="{% static 'admin/css/icekit_dashboard.less' %}" />
<link type="text/less" rel="stylesheet" href="{% static 'admin/css/override.less' %}" />
{% endcompress %}
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="{% static 'icekit/bower_components/font-awesome/css/font-awesome.css' %}">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an incidental fix that I've been meaning to make for at least a year.

There's no benefit to using a CDN for the admin, and it adds another point of failure.

My guess is that it was added in by Pat during initial prototyping and no one has never corrected it.

@markfinger
Copy link
Member Author

markfinger commented Oct 31, 2017

Edit: all is well in docker-town

Looks like the docker build needs some tweaks. I had assumed that the setup-django.sh script was used in the build, but it looks like we need to explicitly add the various bits to the dockerfile.

Just waiting on travis to do its thing...

@coveralls
Copy link

Coverage Status

Coverage remained the same at 73.719% when pulling a506d9f on feature/286-bower-install-icekit-deps into 8ae0e65 on develop.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants