diff --git a/django/cantusdb_project/static/style.css b/django/cantusdb_project/static/style.css index 2792de766..7c542a23d 100644 --- a/django/cantusdb_project/static/style.css +++ b/django/cantusdb_project/static/style.css @@ -1,15 +1,140 @@ body { background-image: url("background.jpg"); - font-family: "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif; } -.page { +.error-page { margin: auto; max-width: 600px; background-color: white; padding: 20px; + font-family: "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif; } -h1 { +.error-page h1 { font-weight: 500; +} + +html { + position: relative; + min-height: 90%; +} + +body { + margin-bottom: 30px; + /* Margin bottom by footer height */ + background-image: url("background.jpg"); +} + +.container { + /* this is relevant for the Article List page */ + overflow-wrap: break-word; +} + +.footer { + position: absolute; + bottom: 0; + width: 100%; + height: 30px; +} + +.footer li { + padding: 5px 0px !important +} + +.bg-footer { + background-color: #CC3333; +} + +/* Change dropdown selected background to blue */ +.dropdown .dropdown-menu .dropdown-item:active, +.dropdown .dropdown-menu .dropdown-item:hover { + background-color: #f6f6f6 !important; + color: #CC3333; +} + +hr.color { + border-top: 1px solid lightblue !important; +} + +.nav-link { + color: black; +} + +.nav-item { + margin: 0px 10px; +} + +.nav-item .nav-link .small { + color: #5e5e5f; +} + +.navbar-toggler { + margin: 0px 10px; +} + +.navbar-brand { + margin: 0px 10px; +} + +.navbar-brand img { + max-height: 60px; + width: auto; +} + +.border-top { + border-style: solid none none; + border-width: 5px !important; + border-color: #CC3333 !important; +} + +a { + color: #922; +} + +a:hover { + color: #922; + text-decoration: underline; +} + +.footer h5 { + margin: 25px 0px 10px +} + +/* links, appearing in sidebars, preceded with guillemets ("»"s) */ +.guillemet { + display: block +} + +.guillemet::before { + content: "» " +} + +.select2 { + width: 100% !important; +} + +/* this class is used for displaying results under the global search bar */ +.list-group-item-action:hover { + color: black; + transition: background-color .25s; + background-color: #CC3333; +} + +@media print { + + header, + footer, + .search-bar, + .sidebar { + display: none; + } +} + +@media (max-width: 992px) { + + /* 992px = bootstrap large breakpoint */ + .main-content { + margin-bottom: 16px; + + } } \ No newline at end of file diff --git a/django/cantusdb_project/templates/base.html b/django/cantusdb_project/templates/base.html index 9039febab..1b43bdf80 100644 --- a/django/cantusdb_project/templates/base.html +++ b/django/cantusdb_project/templates/base.html @@ -1,494 +1,400 @@ {% load static %} -{% load helper_tags %} {# for has_group #} - +{% load helper_tags %} +{# for has_group #} - - {% if PROJECT_ENVIRONMENT == "PRODUCTION" %} - - - - {% endif %} - {% if not PROJECT_ENVIRONMENT == "PRODUCTION" %} - {# to ensure Google/etc. only indexes the main production site, and not staging #} - - {% endif %} - {% block title %} - Cantus Database - {% endblock %} - - - - - - - - - - - - - - - - - - - - - {% block scripts %} - {% endblock %} - - - -
- -
- +
+ +
+ +
+ {% block content %} + {% endblock %} +
+ + - diff --git a/nginx/error_pages/500.html b/nginx/error_pages/500.html index 8d987ae68..de72faa37 100644 --- a/nginx/error_pages/500.html +++ b/nginx/error_pages/500.html @@ -1,16 +1,24 @@ - - 500 Internal Server Error | Cantus Manuscript Database - - - - -
- -

500 Internal Server Error

-

The server encountered a temporary error and could not fulfill your request.

-

Our apologies. Please wait a few moments and try again.

-
- - \ No newline at end of file + + 500 Internal Server Error | Cantus Manuscript Database + + + + +
+ + + +

+ 500 Internal Server Error +

+

+ The server encountered a temporary error and could not fulfill your request. +

+

+ Our apologies. Please wait a few moments and try again. +

+
+ + diff --git a/nginx/error_pages/502.html b/nginx/error_pages/502.html index c9b67bfdf..864b9e1a8 100644 --- a/nginx/error_pages/502.html +++ b/nginx/error_pages/502.html @@ -1,16 +1,24 @@ - - 502 Bad Gateway | Cantus Manuscript Database - - - - -
- -

502 Bad Gateway

-

The server encountered a temporary error and could not fulfill your request.

-

Our apologies. Please wait a few moments and try again.

-
- + + 502 Bad Gateway | Cantus Manuscript Database + + + + +
+ + + +

+ 502 Bad Gateway +

+

+ The server encountered a temporary error and could not fulfill your request. +

+

+ Our apologies. Please wait a few moments and try again. +

+
+ diff --git a/nginx/error_pages/504.html b/nginx/error_pages/504.html index 74fb4a365..f45edb853 100644 --- a/nginx/error_pages/504.html +++ b/nginx/error_pages/504.html @@ -1,16 +1,24 @@ - - 504 Gateway Timeout | Cantus Manuscript Database - - - - -
- -

504 Gateway Timeout

-

The server took too long to respond and could not fulfill your request.

-

Our apologies. Please wait a few moments and try again.

-
- + + 504 Gateway Timeout | Cantus Manuscript Database + + + + +
+ + + +

+ 504 Gateway Timeout +

+

+ The server took too long to respond and could not fulfill your request. +

+

+ Our apologies. Please wait a few moments and try again. +

+
+