Merge branch 'feature/base/html' into 'develop'

A few changes design of menu

See merge request 2020-2021/online/s101/group-02/access_controller!5
This commit is contained in:
Кравченко Артем
2021-02-11 17:28:55 +00:00
4 changed files with 7 additions and 4 deletions

View File

@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/3.1/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/3.1/ref/settings/
"""
import os
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -116,8 +116,9 @@ USE_TZ = True
# https://docs.djangoproject.com/en/3.1/howto/static-files/
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = [
'static'
os.path.join(BASE_DIR, 'staticfiles'),
]
MEDIA_ROOT = BASE_DIR / 'media'