diff --git a/.DS_Store b/.DS_Store index 0ba692f..b6172c5 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/__pycache__/contextualise.cpython-37.pyc b/__pycache__/contextualise.cpython-37.pyc index 1d3a7ae..97516cd 100644 Binary files a/__pycache__/contextualise.cpython-37.pyc and b/__pycache__/contextualise.cpython-37.pyc differ diff --git a/contextualise.py b/contextualise.py index 1d26dbf..ea5b642 100644 --- a/contextualise.py +++ b/contextualise.py @@ -157,7 +157,7 @@ def diverge(): now = datetime.now() #description time session['wordpath'].append(searchterm) session['clicktime'].append(now) - return render_template('diverge.html', wordlist_dict=wordlist_dict, searchterm=searchterm) + return render_template('diverge.html', wordlist_dict=wordlist_dict, searchterm=searchterm, index_dict=index_dict) @app.route('/listofwords') def listofwords(): diff --git a/static/.DS_Store b/static/.DS_Store index 2dccfb2..411135c 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ diff --git a/static/css/Compagnon-Bold.woff b/static/css/Compagnon-Bold.woff new file mode 100755 index 0000000..bcf4f25 Binary files /dev/null and b/static/css/Compagnon-Bold.woff differ diff --git a/static/css/Compagnon-Bold.woff2 b/static/css/Compagnon-Bold.woff2 new file mode 100755 index 0000000..a6554ce Binary files /dev/null and b/static/css/Compagnon-Bold.woff2 differ diff --git a/static/css/Compagnon-Italic.woff b/static/css/Compagnon-Italic.woff new file mode 100755 index 0000000..b0f9054 Binary files /dev/null and b/static/css/Compagnon-Italic.woff differ diff --git a/static/css/Compagnon-Italic.woff2 b/static/css/Compagnon-Italic.woff2 new file mode 100755 index 0000000..73ef07c Binary files /dev/null and b/static/css/Compagnon-Italic.woff2 differ diff --git a/static/css/Compagnon-Light.woff b/static/css/Compagnon-Light.woff new file mode 100755 index 0000000..b0c6e87 Binary files /dev/null and b/static/css/Compagnon-Light.woff differ diff --git a/static/css/Compagnon-Light.woff2 b/static/css/Compagnon-Light.woff2 new file mode 100755 index 0000000..8f962de Binary files /dev/null and b/static/css/Compagnon-Light.woff2 differ diff --git a/static/css/Compagnon-Medium.woff b/static/css/Compagnon-Medium.woff new file mode 100755 index 0000000..4eb136c Binary files /dev/null and b/static/css/Compagnon-Medium.woff differ diff --git a/static/css/Compagnon-Medium.woff2 b/static/css/Compagnon-Medium.woff2 new file mode 100755 index 0000000..13b9528 Binary files /dev/null and b/static/css/Compagnon-Medium.woff2 differ diff --git a/static/css/Compagnon-Roman.woff b/static/css/Compagnon-Roman.woff new file mode 100755 index 0000000..bef9810 Binary files /dev/null and b/static/css/Compagnon-Roman.woff differ diff --git a/static/css/Compagnon-Roman.woff2 b/static/css/Compagnon-Roman.woff2 new file mode 100755 index 0000000..c519337 Binary files /dev/null and b/static/css/Compagnon-Roman.woff2 differ diff --git a/static/css/main.css b/static/css/main.css index 38e9964..58aec9c 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,11 +1,37 @@ -/* @font-face { - font-family: 'whoismono'; - src: url('whois-mono-webfont.woff2') format('woff2'), - url('whois-mono-webfont.woff') format('woff'); - font-weight: normal; +@font-face { + font-family: 'Compagnon'; + src: url('Compagnon-Bold.woff2') format('woff2'), + url('Compagnon-Bold.woff') format('woff'), ; + font-weight: bold; font-style: normal; +} +@font-face { +font-family: 'Compagnon'; +src: url('Compagnon-Italic.woff') format('woff'); +font-weight: normal; +font-style: italic; +} + +@font-face { +font-family: 'Compagnon'; +src: url('Compagnon-Medium.woff') format('woff'); +font-weight: medium; +font-style: normal; +} -} */ +@font-face { +font-family: 'Compagnon'; +src: url('Compagnon-Light.woff') format('woff'); +font-weight: light; +font-style: normal; +} + +@font-face { +font-family: 'Compagnon'; +src: url('Compagnon-Roman.woff') format('woff'); +font-weight: normal; +font-style: roman; +} @import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap'); @@ -24,10 +50,23 @@ a{ color: black; } .text a:visited{ - color: purple; + color: red; } .text a:hover{ - color: red; + background: : red; + color: white; +} + + +/********************************************************/ +/* SELECTION */ +/********************************************************/ + +::selection { + background: magenta; /* WebKit/Blink Browsers */ +} +::-moz-selection { + background: magenta; /* Gecko Browsers */ } @@ -38,7 +77,7 @@ a{ div.home{ /* padding: 1em 5em 1em 7.5em; */ - padding-left: 7em; + padding-left: 9em; padding-top: 3em; padding-bottom: 3em; padding-right: 0.5em; @@ -54,13 +93,34 @@ div.home a:hover{ /* text-decoration: underline overline dotted red; */ /* font-weight: bold; */ background: red; + color: white; } -.explanation { - width: 6%; - font-size: 0.4em; - font-family: monospace; +div.explanation{ + width: 100%; + position: fixed; + bottom: 0; + top: -6.5em; + left: 9em; + right: 0; + background: white; + color: bla; + height: 1em; + padding: 10px 0 10px 10px; + /* width: 6%; */ + font-size: 0.75em; + /* font-family: monospace; */ float: left; padding-right: 0.7em; + -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%); } @@ -93,6 +153,9 @@ header{ #logobox a, #logobox a:visited{ color: black; } +#logobox a:hover{ + color: red; +} h1{ font-size: 2em; @@ -142,8 +205,18 @@ li a{ color: #0000FF } -li a:hover{ - color: orange; +li:hover a{ + color: white; + background-color: red; +} +li{ + padding-left: 5px; + padding-right: 5px; +} +li:hover { + background-color: red; + padding-left: 5px; + padding-right: 5px; } img{ @@ -165,6 +238,8 @@ div{ /********************************************************/ #thewordpath{ + font-family: 'Compagnon'; + font-style: roman; display: block; background-color: white; position: fixed; @@ -217,6 +292,10 @@ transform: rotate(90deg); */ border:1px solid pink; */ } +.column a:hover{ + color: white; + background-color: red; +} /********************************************************/ /* NAVIGATION BAR AT THE BOTTOM OF DESCRIPTION*/ @@ -241,12 +320,21 @@ nav.nav_bottom { overflow: hidden; position: fixed; background: white; - border-top:0.05em solid black; + padding-top: 10px; + padding-bottom: 10px; + /* border-top:0.05em solid black; */ } nav.nav_bottom div li { margin-right: 2em; } +nav.nav_bottom div li a{ + color: black +} +nav.nav_bottom div li a:hover{ + color: red; + background-color: black; +} nav.nav_bottom div li:first-child { margin-right: 0; @@ -273,17 +361,27 @@ div.diverge_all{ div.diverge_all p{ font-weight: bold; font-size: 1.3em; - /* text-transform: uppercase; */ + margin-left: 14.3em; } div.diverge_list { - padding-left: 30%; + width: 40%; +} +div.diverge_list a{ + } + div.about{ padding: 1em 5em 1em 7.5em; } +span.folder-corner { + + font-size: 0.8em; + font-style: italic; +} + /********************************************************/ /* INDEX OF FOLDERS */ @@ -295,8 +393,15 @@ div.about{ padding-top: 50px; padding-bottom: 50px; } +.foldersindex a{ + color: black; + width: 100%; + /* height: 98%; */ + display: inline-block; +} .foldersindex a:hover{ - background-color: yellow; + background-color: red; + color: white; width: 100%; /* height: 98%; */ display: inline-block; diff --git a/templates/diverge.html b/templates/diverge.html index 0c11d23..846f65a 100644 --- a/templates/diverge.html +++ b/templates/diverge.html @@ -2,16 +2,20 @@ {% block content %}
{{ searchterm }} :
+Sentences that have {{ searchterm }} in common :