From 01fec0b462998e6d1f7a4422b02719c07b9f311e Mon Sep 17 00:00:00 2001 From: Sandra Date: Tue, 14 Apr 2020 12:40:18 +0200 Subject: [PATCH 1/5] title page changes --- static/title.css | 20 ++++++++++++-------- templates/title.html | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/static/title.css b/static/title.css index c68f3fc..05969db 100644 --- a/static/title.css +++ b/static/title.css @@ -1,6 +1,6 @@ body { - background-color: #aaa4a0; - font-family: Arial, Helvetica, sans-serif; + background-color: #F4EBE8; + font-family: Roboto Mono; } .grid-container { display: grid; @@ -47,6 +47,7 @@ a:hover { color: blue; } + h1 { position: fixed; right:0%; @@ -167,20 +168,20 @@ p { position: fixed; top:5%; left:0%; - background-color: ; + background-color: transparent; width: 40%; z-index: 10; - opacity: 0.7; + opacity: 1; } .collapsible { - background-color: #777; - color: white; + background-color: transparent; + color: black; cursor: pointer; padding: 18px; width: 10%; height: auto; - border: none; + border: solid 1px; text-align: right; outline: none; font-size: 15px; @@ -246,12 +247,15 @@ a.content:link { .timelinelink { position: fixed; bottom:0%; - right:10%; + left:5%; background-color: white; z-index: 10; font-size: 30px; + padding-left: 5px; } +.timelinelink:hover {timeline} + .orglink { position: fixed; bottom:0%; diff --git a/templates/title.html b/templates/title.html index f47d886..eacdabf 100644 --- a/templates/title.html +++ b/templates/title.html @@ -6,6 +6,7 @@ + {{ page.name }} From 9ef1e8600983331da29981cbf8475d776626a8f1 Mon Sep 17 00:00:00 2001 From: Castro0o Date: Tue, 14 Apr 2020 13:58:20 +0200 Subject: [PATCH 2/5] removed uncessary reference to printout_dict --- dumpwiki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dumpwiki.py b/dumpwiki.py index 1f883ed..e57ad49 100644 --- a/dumpwiki.py +++ b/dumpwiki.py @@ -94,7 +94,7 @@ def rewriteimgs(html): # get its filename img_filename = images_info[img_page]['filename'] except KeyError: - print(Colors.WARNING, f"{printout_dict['page']} is not is missing from the local downloaded images") + print(Colors.WARNING, f"{img_page} is not is missing from the local downloaded images") print(Colors.GREEN, 'run python3 download_imgs.py to fix the issue', Colors.ENDC) sys.exit() # same dir as HTML files: archive/ From d7bbacc5a7492d7299e2d30a89da32b0a61a2b9f Mon Sep 17 00:00:00 2001 From: Sandra Date: Tue, 14 Apr 2020 14:21:23 +0200 Subject: [PATCH 3/5] title page htext --- static/title.css | 116 +++++++++++++++++++++++++++++++------------ templates/title.html | 4 +- 2 files changed, 85 insertions(+), 35 deletions(-) diff --git a/static/title.css b/static/title.css index 05969db..fcd512e 100644 --- a/static/title.css +++ b/static/title.css @@ -7,7 +7,7 @@ body { grid-template-columns: repeat(4, 1fr); grid-gap: 10px; position: absolute; - top: 60%; + top: 5%; width: 96%; height: auto; left:2%; @@ -51,13 +51,14 @@ a:hover { h1 { position: fixed; right:0%; - top:3%; + top:5%; text-align: right; - background-color: grey; + background-color: #0BEFEB; padding: 3px 30px 3px 10px; z-index: 10; color: black; font-size: 28px; + opacity: 0.7; } h2{ @@ -65,24 +66,20 @@ h2{ right: 0%; top: 15%; text-align: left; - background-color: grey; - color: black; + background-color: #0BEFEB; + /*color: black;*/ padding: 3px 3px 3px 30px; z-index: 10; font-size: 20px; + opacity: 0.7; } -/*.indexlist { - position: absolute; - top:20%; -}*/ - .viewnav { position: fixed; - top:0%; + top:30%; right:0%; background-color: red ; - width: 40%; + width: 10%; z-index: 10; opacity: 0.7; } @@ -93,9 +90,9 @@ h2{ cursor: pointer; padding: 0px; width: 100%; - height: px; + height: auto; border: none; - text-align: left; + text-align: right; outline: none; font-size: 40px; z-index: 10; @@ -108,15 +105,15 @@ h2{ .content2 { position: relative; - padding: 0px 18px; + /*padding: 0px 18px;*/ max-height: 0; overflow: hidden; - width: 50%; + width: 100%; transition: max-height 0.2s ease-out; background-color: grey; color: white; z-index: 10; - text-align: left; + text-align: center; } @@ -200,10 +197,12 @@ p { overflow: hidden; width: 90%; transition: max-height 0.2s ease-out; - background-color: grey; + background-color: #0BEFEB; color: white; z-index: 10; text-align: right; + opacity: 0.7; + } a.content:link { @@ -251,11 +250,9 @@ a.content:link { background-color: white; z-index: 10; font-size: 30px; - padding-left: 5px; + padding-left: } -.timelinelink:hover {timeline} - .orglink { position: fixed; bottom:0%; @@ -265,16 +262,71 @@ a.content:link { font-size: 30px; } -.orglink:hover .hiddentext { - visibility: visible; +/*.orglink { + position: fixed; + bottom:0%; + display: inline-block; + border-bottom: 1px dotted black; +}*/ + +.orglink .htext { + visibility: hidden; + width: 120px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + font-size: 15px; + + /* Position the tooltip */ + position: absolute; + z-index: 10; } -.hiddentext { - visibility: hidden; - width: 120px; - background-color: black; - color: #fff; - text-align: center; - padding: 5px 0; - border-radius: 6px; -} \ No newline at end of file +.orglink:hover .htext { + visibility: visible; +} + +.timelinelink .htext { + visibility: hidden; + width: 120px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + font-size: 15px; + + /* Position the tooltip */ + position: absolute; + z-index: 10; +} + +.timelinelink:hover .htext { + visibility: visible; +} + +.indexlink .htext { + visibility: hidden; + width: 120px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + font-size: 15px; + + /* Position the tooltip */ + position: absolute; + z-index: 10; +} + +.indexlink:hover .htext { + visibility: visible; +} + + +/*.timelinelink:hover .htext { + visibility: visible; +}*/ diff --git a/templates/title.html b/templates/title.html index eacdabf..f21a816 100644 --- a/templates/title.html +++ b/templates/title.html @@ -22,9 +22,7 @@
- -All Organizations - +
{{ body|safe }}