Skip to content

Commit

Permalink
Reference bluebutton-css in collectstatic pipeline (#669)
Browse files Browse the repository at this point in the history
  • Loading branch information
whytheplatypus authored and johnfrenchxyz committed Dec 4, 2018
1 parent 8128be7 commit 15484c3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions hhs_oauth_server/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,16 @@
# static files and media
ASSETS_ROOT = env('DJANGO_ASSETS_ROOT', BASE_DIR)

STATIC_URL = 'static/'
MEDIA_URL = 'media/'
STATIC_ROOT = os.path.join(ASSETS_ROOT, 'collectedstatic')
MEDIA_ROOT = os.path.join(ASSETS_ROOT, 'media')

MEDIA_URL = 'media/'
STATIC_URL = '/static/'
STATIC_ROOT = 'collectedstatic'

STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'sitestatic'),
os.path.join(BASE_DIR, 'bluebutton-css'),
]

# emails
Expand Down
2 changes: 1 addition & 1 deletion templates/include/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css' %}" type="text/css" />

<!-- CSS from CSS Repo -->
<link rel="stylesheet" href="{% static 'statsite/assets/css/sandbox-main.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'dist/sandbox-main.css' %}" type="text/css" />

0 comments on commit 15484c3

Please sign in to comment.