diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 0759d58..74d3a69 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -129,12 +129,6 @@ STATIC_URL = '/static/' STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'sigiStatic'), ) -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'djangobower.finders.BowerFinder', - 'sass_processor.finders.CssFinder', -) SERVER_EMAIL = 'sigi@interlegis.leg.br' DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' @@ -200,6 +194,17 @@ LOGGING = { }, } +STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, "collected_static") +STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),) + +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'djangobower.finders.BowerFinder', + 'sass_processor.finders.CssFinder', +) + CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = False diff --git a/sigiStatic/img/img_atendimento/favicon.ico b/sigiStatic/img/img_atendimento/favicon.ico new file mode 100644 index 0000000..b816298 Binary files /dev/null and b/sigiStatic/img/img_atendimento/favicon.ico differ diff --git a/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png b/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png new file mode 100644 index 0000000..3bf6484 Binary files /dev/null and b/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png differ diff --git a/sigiStatic/img/img_atendimento/glyphicons-halflings.png b/sigiStatic/img/img_atendimento/glyphicons-halflings.png new file mode 100644 index 0000000..a996999 Binary files /dev/null and b/sigiStatic/img/img_atendimento/glyphicons-halflings.png differ diff --git a/sigiStatic/img/img_atendimento/logo.png b/sigiStatic/img/img_atendimento/logo.png new file mode 100644 index 0000000..bc94190 Binary files /dev/null and b/sigiStatic/img/img_atendimento/logo.png differ diff --git a/sigiStatic/img/img_atendimento/logo_cc.jpg b/sigiStatic/img/img_atendimento/logo_cc.jpg new file mode 100644 index 0000000..8f9b902 Binary files /dev/null and b/sigiStatic/img/img_atendimento/logo_cc.jpg differ diff --git a/sigiStatic/img/img_atendimento/logo_interlegis.jpg b/sigiStatic/img/img_atendimento/logo_interlegis.jpg new file mode 100644 index 0000000..06c178f Binary files /dev/null and b/sigiStatic/img/img_atendimento/logo_interlegis.jpg differ diff --git a/templates/base.html b/templates/base.html index ac7b520..edabff4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,54 +6,48 @@