Commit 742e19db authored by Bunde's avatar Bunde
Browse files

Merge branch '2018-04-tg-django-npm' into 'master'

Add django-npm to manage node packages

See merge request !11
parents 3a2f32a4 1cf752bb
Pipeline #136 passed with stage
in 16 seconds
......@@ -21,5 +21,3 @@ install:
pip install tox ipdb
pip install -e .
npm install
mkdir -p castellum_core/static/
cp node_modules/bootstrap/dist/css/bootstrap.min.css castellum_core/static/
......@@ -95,4 +95,17 @@ STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'static'),
]
STATICFILES_FINDERS = [
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'npm.finders.NpmFinder',
]
STATIC_URL = '/static/'
NPM_ROOT_PATH = os.path.dirname(BASE_DIR)
NPM_FILE_PATTERNS = {
'bootstrap': ['dist/css/bootstrap.min.css'],
}
......@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8" />
<title>{% block title %}Castellum{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}" />
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Security-Policy" content="default-src 'self'" />
</head>
......
......@@ -12,5 +12,6 @@ setup(
install_requires=[
"Django==2.0.4",
"django-bootstrap4==0.0.6",
"django-npm==1.0.0"
],
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment