Skip to content
Snippets Groups Projects
Commit 7490e84e authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'feature-basic-design' into 'master'

Basic design

See merge request kif/akplanning!1
parents 3d2ddd1e 1ab22c9e
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
AKPlanning/settings_secrets.py AKPlanning/settings_secrets.py
# static files generated by django # static files generated by django
static/ /static/
# Created by https://www.gitignore.io/api/python,django,virtualenv,pycharm+all # Created by https://www.gitignore.io/api/python,django,virtualenv,pycharm+all
# Edit at https://www.gitignore.io/?templates=python,django,virtualenv,pycharm+all # Edit at https://www.gitignore.io/?templates=python,django,virtualenv,pycharm+all
......
...@@ -40,6 +40,8 @@ INSTALLED_APPS = [ ...@@ -40,6 +40,8 @@ INSTALLED_APPS = [
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'bootstrap4',
'fontawesome',
] ]
MIDDLEWARE = [ MIDDLEWARE = [
...@@ -119,3 +121,17 @@ USE_TZ = True ...@@ -119,3 +121,17 @@ USE_TZ = True
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = (
'static_common',
)
# Settings for Bootstrap
BOOTSTRAP4 = {
# Use custom CSS
"css_url": {
"href": STATIC_URL + "common/css/bootstrap.css",
},
}
# Settings for FontAwesome
FONTAWESOME_CSS_URL = "//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css"
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment