From 84307c732954b736509d25c96ec66e04c1e3567e Mon Sep 17 00:00:00 2001 From: Cristina Cochior Date: Tue, 22 Sep 2020 11:56:56 +0200 Subject: [PATCH] updates --- static/css/main.css | 12 +++- static/js/mergedjson.json | 11 +--- templates/layout_cristina.html | 5 +- templates/main.css | 106 --------------------------------- 4 files changed, 14 insertions(+), 120 deletions(-) delete mode 100644 templates/main.css diff --git a/static/css/main.css b/static/css/main.css index ecda4df..4544034 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -13,7 +13,7 @@ body{ padding: 1.7em 0em; float: left; width: 50%; - background: #ffcfcf; + background: #ea4f2b; overflow-y: scroll; height: 100vh; } @@ -22,7 +22,7 @@ body{ padding: 2em 1em; float: right; width: 50%; - background: #a28ea2; + background: #8048b7; overflow-y: scroll; height: 100vh; } @@ -56,11 +56,16 @@ li span.nav-button { width: 33.33%; } +li span.nav-button:hover { + color: #8048b7; +} + .nav-top { height: 24px; background: white; width: 100%; position: fixed; + cursor: pointer; } .nav-bottom{ @@ -70,6 +75,7 @@ li span.nav-button { bottom: 0; position: fixed; z-index: 10000; + cursor: pointer; } span.librarian-names, span.file-names { @@ -140,6 +146,7 @@ button#listoffiles { top: 48%; transform: rotate(90deg); width: 6.3%; + z-index: 1; } button#about { @@ -148,4 +155,5 @@ button#about { top: 48%; width: 6.4%; transform: rotate(270deg); + z-index: 1; } diff --git a/static/js/mergedjson.json b/static/js/mergedjson.json index fb40f60..63c445f 100644 --- a/static/js/mergedjson.json +++ b/static/js/mergedjson.json @@ -1695,13 +1695,6 @@ ] },{ "method": "FOUND", -"debrisname": "robin_di_angelo_white_fragility.pdf", -"debrispath": "FOUND/debris.found.references/debris.found.references.robin_di_angelo_white_fragility.pdf", -"librarian": [ -"Amy" -] -},{ -"method": "FOUND", "debrisname": "sobtech2-en-with-covers-web-150dpi-2018-01-10-v2.pdf", "debrispath": "FOUND/debris.found.references/debris.found.references.sobtech2-en-with-covers-web-150dpi-2018-01-10-v2.pdf", "librarian": [ @@ -3321,8 +3314,8 @@ ] },{ "method": "STOLEN", -"debrisname": "say_it_aint_so[silvia_federici]_witches,_witch-hunting,_and_women(z-lib.org).pdf", -"debrispath": "STOLEN/debris.stolen.references/debris.stolen.references.say_it_aint_so[silvia_federici]_witches,_witch-hunting,_and_women(z-lib.org).pdf", +"debrisname": "say_it_aint_so_silvia_federici_witches,_witch-hunting,_and_women.pdf", +"debrispath": "STOLEN/debris.stolen.references/debris.stolen.references.say_it_aint_so_silvia_federici_witches,_witch-hunting,_and_women.pdf", "librarian": [ "Cristina" ] diff --git a/templates/layout_cristina.html b/templates/layout_cristina.html index 7ef7690..035ada6 100644 --- a/templates/layout_cristina.html +++ b/templates/layout_cristina.html @@ -22,7 +22,6 @@
{% for librarian in librarians %} - {{librarian}} {% endfor %}
@@ -61,9 +60,9 @@
- test link + {% block content %} diff --git a/templates/main.css b/templates/main.css deleted file mode 100644 index d8ce606..0000000 --- a/templates/main.css +++ /dev/null @@ -1,106 +0,0 @@ - -* { - box-sizing: border-box; -} - -body{ - margin: 0; - height: 100vh; -} - - -.main-column-left { - padding: 1.7em 0em; - float: left; - width: 50%; - background: red; - overflow-y: scroll; - height: 100vh; -} - -.main-column-right { - padding: 2em 1em; - float: right; - width: 50%; - background: purple; - overflow-y: scroll; - height: 100vh; -} - -.main:after { - content: ""; - display: table; - clear: both; -} - -div.nav-bottom ul, div.nav-top ul { - list-style-type: none; - margin: 0; - padding: 0; -} - -li a.nav-button { - display: block; - text-decoration: none; - padding: 0.25em; - font-family: sans-serif; - float: left; - width: 33.33%; -} - -.nav-top { - height: 1.5em; - background: white; - width: 100%; - position: fixed; -} - -.nav-bottom{ - height: 1.5em; - background: white; - width: 100%; - bottom: 0; - position: fixed; - z-index: 10000; -} - -span.librarian-names, span.file-names { - text-decoration: none; - padding: 0.3em; - color: black; -} - -span.librarian-names:hover, span.file-names:hover { - color: white; - cursor: pointer; -} - -#listofpeople{ - border: lime 1px solid; - position: fixed; - width: 50%; - padding: 0em; -} - -.file-names-container { - /* IE 9 */ - -ms-transform: rotate(-90deg) translate(-78%, 0%); - /* Safari */ - -webkit-transform: rotate(-90deg) translate(-78%, 0%); - /* Standard syntax */ - transform: rotate(-90deg) translate(-0%, 0%); - transform-origin: top left; - border:blue 1px solid; - height: 47em; -width: 30em; -overflow-y: scroll; -overflow-x: hidden; -position: absolute; -left: 0%; -top:100%; - -} - -img.listed-images { - width: 2rem; -}