diff --git a/__pycache__/contextualise.cpython-35.pyc b/__pycache__/contextualise.cpython-35.pyc index 6bc8282..f1ac472 100644 Binary files a/__pycache__/contextualise.cpython-35.pyc and b/__pycache__/contextualise.cpython-35.pyc differ diff --git a/contextualise.py b/contextualise.py index fb52315..1d26dbf 100644 --- a/contextualise.py +++ b/contextualise.py @@ -149,7 +149,7 @@ def description(): textfile = f.read() textfile = Markup(textfile) textfiles.append(textfile) - return render_template('description.html', datafromjson=datafromjson, itemid=itemid, textfiles=textfiles, idno=idno) + return render_template('description.html', datafromjson=datafromjson, itemid=itemid, textfiles=textfiles, idno=idno, index_dict=index_dict) @app.route('/diverge', methods=['GET']) def diverge(): @@ -275,21 +275,12 @@ def get_file(): #joining the strings with linebreaks tadam = '\n'.join(out) - -###################################################################################### -#INDEX PAGE -###################################################################################### -@app.route("/index") -def index(): - return render_template('theindex.html', wordlist_dict=wordlist_dict, index_dict=index_dict) - # have a message in file if no nav has been recorded so it's less dull than error page if tadam is None: tadam = "This score is Null" # print("verylastnow : "+str(clickongetfilefime)+"\n") - print(tadam) return Response(tadam, @@ -298,5 +289,18 @@ def index(): "attachment;filename=yourveryspecialscore.txt"}) + + + +###################################################################################### +#INDEX PAGE +###################################################################################### +@app.route("/index") +def index(): + return render_template('theindex.html', wordlist_dict=wordlist_dict, index_dict=index_dict) + + + + if __name__ == '__main__': app.run(debug=True) diff --git a/static/css/main.css b/static/css/main.css index 4649567..b8ee691 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,25 +1,95 @@ -@font-face { +/* @font-face { font-family: 'whoismono'; src: url('whois-mono-webfont.woff2') format('woff2'), url('whois-mono-webfont.woff') format('woff'); font-weight: normal; font-style: normal; -} +} */ + +@import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap'); + + body{ background: #ffffff; - color:blue; - font-family: 'whoismono'; - width: 100%; + color:black; + font-family: 'Montserrat', sans-serif; top:0; left: 0; margin: 0; - padding: 0; + +} +a{ + color: black; +} +.text a:visited{ + color: purple; +} +.text a:hover{ + color: red; +} + + +/********************************************************/ +/* FIRST PAGE */ +/********************************************************/ + + +div.home{ + padding: 1em 5em 1em 7.5em; + text-align: justify; + font-size: 1em; +} +div.home a:hover{ + font-style: italic; + font-size: 0.95em; + /* font-weight: bold; */ +} + + + +/********************************************************/ +/* NAVIGATION */ +/********************************************************/ +header{ + padding-top: 3em; +} + +#logobox{ + position: fixed; + top: 0; + bottom: 0; + height: 1.5em; + margin: auto; + background: none; + left: 0; + -webkit-transform-origin: 0 50%; + -moz-transform-origin: 0 50%; + -ms-transform-origin: 0 50%; + -o-transform-origin: 0 50%; + transform-origin: 0 50%; + -webkit-transform: rotate(-90deg) translate(-50%, 50%); + -moz-transform: rotate(-90deg) translate(-50%, 50%); + -ms-transform: rotate(-90deg) translate(-50%, 50%); + -o-transform: rotate(-90deg) translate(-50%, 50%); + transform: rotate(-90deg) translate(-50%, 50%); +} +#logobox a, #logobox a:visited{ + color: black; } h1{ - margin-top: 50px; + font-size: 2em; + line-height: 1.5; + display:inline; + background-color: none; + /* width: 100%; */ +} + +ul.menu { + margin-left: 0.4em; + position: fixed; } /********************************************************/ @@ -34,10 +104,7 @@ a:visited { color:purple; } -a:hover{ - background: pink; -} ul{ @@ -53,12 +120,12 @@ li a:hover{ } img{ - max-width: 500px; + max-width: 90%; margin-bottom: 15px; /* float: left; */ } video{ - max-width: 400px; + max-width: 90%; } div{ @@ -72,8 +139,9 @@ div{ #thewordpath{ display: block; - /* background-color: yellow; */ + background-color: white; position: fixed; + /* border-bottom: black 1.5px solid; */ width: 100%; top:0; right: 0; @@ -83,7 +151,7 @@ div{ padding: 10px; z-index: 2; width: auto; - background-color: white; + /* background-color: white; */ /* border:1px blue solid; */ /* -webkit-transform-origin: right top; -webkit-transform: rotate(90deg); @@ -93,7 +161,7 @@ div{ transform: rotate(90deg); */ } .word{ - color:silver; + color:black; } @@ -103,43 +171,28 @@ transform: rotate(90deg); */ .description{ width: 80%; - /* border: 1px solid red; */ } .text{ float: right; width: 50%; - /* border:1px solid #444; */ /* position: relative; */ } - .item{ /* position: relative; */ float: left; width: 50%; /* vertical-align: top; */ - /* border:1px solid #444; */ + padding-top: 7.8%; } -/* .text{ - float: right; -} -.item{ - float: left; +.column h2{ + /* color: pink; + border:1px solid pink; */ } -.column{ - padding: 10px; - float: left; -width: 40%; -} -.allcontent:after { - content: ""; - display: table; - clear: both; -} */ /********************************************************/ -/* NAVIGATION AT THE BOTTOM OF DESCRIPTION*/ +/* NAVIGATION BAR AT THE BOTTOM OF DESCRIPTION*/ /********************************************************/ .index { display: block; @@ -159,6 +212,9 @@ nav.nav_bottom { -moz-osx-font-smoothing: grayscale; list-style-type: none; overflow: hidden; + position: fixed; + background: white; + border-top:1.5px solid black; } nav.nav_bottom div li { @@ -169,23 +225,57 @@ nav.nav_bottom div li:first-child { margin-right: 0; } -div#bottom_descrip_left, div#bottom_descrip_right { - -} - - -li.index { +li.index, li.about { float: left; + margin-left: 10px; } li.prev_item, li.next_item, li.no_here { float: right; } + /********************************************************/ /* DIVERGE */ /********************************************************/ -.diverge{ - margin-left: 1em; +div.diverge_all{ + padding: 1em 6.3em 1em; +} + +div.diverge_all p{ + font-weight: bold; + font-size: 1.3em; + /* text-transform: uppercase; */ +} + +div.diverge_list { + padding-left: 30%; +} + +div.about{ + padding: 1em 5em 1em 7.5em; +} + + +/********************************************************/ +/* INDEX OF FOLDERS */ +/********************************************************/ + +.foldersindex{ + /* border: black 1px solid; */ + width: 35%; + padding-top: 50px; + padding-bottom: 50px; +} +.foldersindex a:hover{ + background-color: yellow; + width: 100%; + /* height: 98%; */ + display: inline-block; +} + + +h1.logo a { + text-transform: uppercase; } diff --git a/templates/description.html b/templates/description.html index 93b8518..af300db 100644 --- a/templates/description.html +++ b/templates/description.html @@ -2,8 +2,6 @@ {% block content %}
-

{{ itemid }}

- @@ -25,6 +23,7 @@ {% endfor %}
+

{{ itemid }}. {{index_dict[itemid]}}

{% set count=[0] %} {% for item in datafromjson %} {% if item.lower().endswith(('.html')) %} @@ -72,7 +71,8 @@