diff --git a/library/page.py b/library/page.py index 91c3ce0..5a654c2 100644 --- a/library/page.py +++ b/library/page.py @@ -103,6 +103,7 @@ def show_book(publicationID): # return a full publication with or without form errors return render_template( "publication.html", + title=APP.config["TITLE"], fullpublication=fullpublication, publicationID=publicationID, borrowform=borrowform, diff --git a/library/static/css/bookmark.css b/library/static/css/bookmark.css deleted file mode 100644 index 2e9cf76..0000000 --- a/library/static/css/bookmark.css +++ /dev/null @@ -1,23 +0,0 @@ -#pastevents{ - position: fixed; - top: -1em; - right: 3em; - height: 14em; -} - -#upcomingevents{ - position: fixed; - top: -2.5em; - right: 6em; - height: 14em; -} -#pastevents:hover{ - z-index: 1; -} -@media only screen and (min-device-width: 320px) and (max-device-width: 480px) { - #upcomingevents,#pastevents { - position:absolute; - width: 15%; - height: auto; - } -} diff --git a/library/static/css/style.css b/library/static/css/style.css index aa63b84..fd55017 100644 --- a/library/static/css/style.css +++ b/library/static/css/style.css @@ -2,8 +2,6 @@ html, body { margin: 0; font-family: "libreBaskerville"; font-style: normal; - background-repeat: no-repeat; - background-attachment: fixed; } body:after { @@ -45,7 +43,6 @@ body:after { box-shadow: 0.3em 0.35em rgba(0,0,0,0.3); } - @supports (-webkit-text-stroke: 1px darkgreen) { #library { -webkit-text-stroke: 1px darkgreen; @@ -162,7 +159,7 @@ a:hover { text-decoration: none; } a:active { text-decoration: none; } div#auth_buttons{ - position: fixed; + position: absolute; top: 0.7em; right: 0.7em; display:flex; @@ -171,6 +168,17 @@ div#auth_buttons{ justify-content: center; align-items: center; } +div#login { + width: 30%; + margin-left: auto; + margin-right: auto; + text-decoration: none; +} +input[type=text], input[type=password], input[type=file] { + width: 18em; + max-width: 18em; + border: 1px solid #E0B0FF; +} @media only screen and (min-device-width: 320px) and (max-device-width: 480px) { #library { diff --git a/library/static/css/upload.css b/library/static/css/upload.css index cc7aae8..4ec9c0e 100644 --- a/library/static/css/upload.css +++ b/library/static/css/upload.css @@ -18,7 +18,7 @@ padding: 1em 0em 1em 0em; } -input[type=text], select { +.uploadform-field input[type=text], select { width: 100%; padding: 1em 3em; padding-left: 0.5em; diff --git a/library/templates/base.html b/library/templates/base.html index ede3d56..9964092 100644 --- a/library/templates/base.html +++ b/library/templates/base.html @@ -6,7 +6,6 @@ {{title}} - @@ -16,6 +15,35 @@ +
+ {% if not current_user.is_authenticated %} +
+ + + + + Sign in + +
+
+ + + + + Register + +
+ {% else %} +
+ + + + + Sign out + +
+ {% endif %} +

{{title}}

 {% block main %} {% endblock main %} diff --git a/library/templates/index.html b/library/templates/index.html index 42f41dc..c62bde7 100644 --- a/library/templates/index.html +++ b/library/templates/index.html @@ -4,35 +4,6 @@ -
- {% if not current_user.is_authenticated %} -
- - - - - Sign in - -
-
- - - - - Register - -
- {% else %} -
- - - - - Sign out - -
- {% endif %} -
{% for id, pubinfo in publications.items() %}