From 7c25ba070abf39c85d53485c8446f8ee9cb73167 Mon Sep 17 00:00:00 2001 From: Greg Thole Date: Sat, 13 Jan 2018 14:22:33 -0500 Subject: [PATCH] Various fixes and updates --- gedgo/static/styles/style-default.css | 20 +++++++++++++++---- gedgo/templates/default/base.html | 10 +++++----- gedgo/templates/default/blogpost.html | 2 +- gedgo/templates/default/documentaries.html | 2 +- gedgo/templates/default/person.html | 12 +++++------ gedgo/templates/default/research.html | 20 +++++++++---------- gedgo/templates/default/research_preview.html | 17 +++++++++++++++- gedgo/urls.py | 2 +- gedgo/views/model_views.py | 1 + gedgo/views/research.py | 7 ++++--- gedgo/views/util.py | 8 +++++--- 11 files changed, 65 insertions(+), 36 deletions(-) diff --git a/gedgo/static/styles/style-default.css b/gedgo/static/styles/style-default.css index aaca3d5..99f4683 100644 --- a/gedgo/static/styles/style-default.css +++ b/gedgo/static/styles/style-default.css @@ -1,10 +1,16 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { - background-color: #F5F8FA; + background-color: #d5dce0; + font-family: Camphor, Open Sans, Segoe UI, sans-serif; + text-rendering: optimizeLegibility; +} + +a { + color: #537484; } .navbar { - background-color: #3097D1 !important; + background-color: #538463 !important; } .navbar-nav li a { color: #fcfcfc !important; @@ -13,10 +19,10 @@ body { color: #666 !important; } .navbar-nav .active a { - background-color: #3097D1 !important; + background-color: #6e9b7d !important; } .navbar-nav .open .dropdown-toggle { - background-color: #3097D1 !important; + background-color: #6e9b7d !important; } .navbar-brand { @@ -28,6 +34,7 @@ body { } .main { + margin: 5px; color: #666; background-color: #fff; padding: 20px; @@ -72,6 +79,11 @@ body { max-width: 100%; margin-bottom: 10px; } + +.research-file-item { + min-height: 64px; +} + .comment-area { resize: none; } diff --git a/gedgo/templates/default/base.html b/gedgo/templates/default/base.html index 042470d..d3cfc30 100644 --- a/gedgo/templates/default/base.html +++ b/gedgo/templates/default/base.html @@ -6,6 +6,7 @@ + {% block headappend %}{% endblock %}