From 843cc1e518f46ce2e2b1aafb3c9bd7362896e7b5 Mon Sep 17 00:00:00 2001 From: Sandra Date: Fri, 17 Apr 2020 23:21:39 +0200 Subject: [PATCH 01/11] bottom --- static/archive.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/archive.css b/static/archive.css index fc542b4..47770ba 100644 --- a/static/archive.css +++ b/static/archive.css @@ -139,13 +139,14 @@ vertical-align:middle; h1 { position: fixed; right:0%; - top:5%; + bottom: 83%; text-align: right; background-color: rgba(11,239,235,0.7); color: #371F10; padding: 3px 35px 3px 10px; z-index: 10; font-size: 28px; + max-width: 93%; } a, a:visited{ From 16c458d6a42096e568514bc499e58420c3546aca Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 23:22:27 +0200 Subject: [PATCH 02/11] timeline css and html --- static/timeline.css | 4 ++-- templates/timeline.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/timeline.css b/static/timeline.css index 6086b2b..b1ae114 100644 --- a/static/timeline.css +++ b/static/timeline.css @@ -3,7 +3,7 @@ body{ background-color: #F4EBE8; } -h1 { +.pagetitle { position: fixed; right:0%; top:5%; @@ -15,7 +15,7 @@ h1 { font-size: 28px; } -.eventdate { +h1 { font-family: Roboto Mono; font-size: 40px; color: #371F10; diff --git a/templates/timeline.html b/templates/timeline.html index 334248f..4efde72 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -8,7 +8,7 @@ Timeline -

Timeline

+
Timeline
{{ body|safe }}
From 18e826812b21c48edb7c2f2f9c68efc5632826b7 Mon Sep 17 00:00:00 2001 From: Sandra Date: Fri, 17 Apr 2020 23:23:23 +0200 Subject: [PATCH 03/11] h1 --- static/title.css | 14 +++++++------- templates/title.html | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/static/title.css b/static/title.css index 3d1a208..e97ca60 100644 --- a/static/title.css +++ b/static/title.css @@ -33,7 +33,7 @@ body { /*links*/ a:link { - text-decoration: none; + text-decoration: ; color: #371F10; } @@ -49,16 +49,16 @@ a:hover { h1 { - /*position: fixed; +/* position: fixed; right:0%; - top:5%; + bottom:83%; text-align: right; background-color: rgba(11,239,235,0.7); padding: 3px 35px 3px 10px; - z-index: 10; - font-size: 27px; - color: #371F10;*/ - max-width: 90%; + z-index: 10;*/ +/* font-size: ;*/ +/* color: #371F10; + max-width: 90%;*/ } h2{ diff --git a/templates/title.html b/templates/title.html index 5a28054..d707129 100644 --- a/templates/title.html +++ b/templates/title.html @@ -41,6 +41,8 @@ for (i = 0; i < coll.length; i++) { }); } +var links = document.querySelectorAll("*[title]"); +for (var i=0; i From fb6b0fd74b65e2029051def1e2289332e28ad465 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 23:30:08 +0200 Subject: [PATCH 04/11] >> --- static/orgs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/orgs.css b/static/orgs.css index 7fd4f49..d625c89 100644 --- a/static/orgs.css +++ b/static/orgs.css @@ -7,11 +7,11 @@ body { background-color: #F4EBE8; font-family: Roboto Mono; - font-size:14px; } /* Organizations list */ .collapsible{ + font-size:14px; padding-left: 70px; line-height: 1; color: #371F10; From 013a1c7d97797b4d949fd103d1ef199dab13c6ad Mon Sep 17 00:00:00 2001 From: Damlanur Date: Sat, 18 Apr 2020 00:05:15 +0200 Subject: [PATCH 05/11] typo fixed in topicformat.css --- static/topicformat.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/static/topicformat.css b/static/topicformat.css index ebb15c7..09c75d0 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -15,7 +15,7 @@ body { height: auto; margin-left: 120px; margin-right: 120px; - text-align: : center; + text-align: center; z-index: 5; } @@ -32,9 +32,6 @@ body { border-color: #0BEFEB; height: 500px; } -.image { - width: 300px; -} .title { display:block; From 86177862c828dabf2a50f84a0fe51b3814765d9d Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Sat, 18 Apr 2020 00:26:06 +0200 Subject: [PATCH 06/11] Iona#2 --- static/timeline.css | 5 +---- templates/timeline.html | 7 ++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/static/timeline.css b/static/timeline.css index b1ae114..8c861b5 100644 --- a/static/timeline.css +++ b/static/timeline.css @@ -15,10 +15,7 @@ body{ font-size: 28px; } -h1 { - font-family: Roboto Mono; - font-size: 40px; - color: #371F10; +.eventdate { margin-top: 1%; } diff --git a/templates/timeline.html b/templates/timeline.html index 4efde72..debf6ad 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -3,13 +3,14 @@ + - Timeline + {{ page.name }} -
Timeline
-
{{ body|safe }}
+

{{ page.name }}

+
{{ body|safe }}
From 64a78e48eebe8e5d93e8ec268b290079efd90176 Mon Sep 17 00:00:00 2001 From: Sandra Date: Sat, 18 Apr 2020 00:52:00 +0200 Subject: [PATCH 07/11] grid fixes --- static/title.css | 1 - static/topicformat.css | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/static/title.css b/static/title.css index e97ca60..5776814 100644 --- a/static/title.css +++ b/static/title.css @@ -241,7 +241,6 @@ p { text-align: left; opacity: 0.7; right:0%; - } a.content:link { diff --git a/static/topicformat.css b/static/topicformat.css index ebb15c7..e42c8c7 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -3,7 +3,7 @@ body { font-size: 18px; } -.grid-container { +/*.grid-container { display: inline-grid; grid-template-columns: repeat(3, 1fr); grid-column-gap: 5px; @@ -24,8 +24,40 @@ body { position: relative; text-align: left; z-index: 5; +}*/ + +.grid-container { + display: grid; + grid-template-columns: repeat(3, 1fr); + grid-column-gap: 50px; + grid-row-gap: 100px; + /* grid-auto-flow: dense;*/ + position: absolute; + top: 25%; + width: 90%; + height: auto; + left: 5%; + margin-left: 10px; + margin-right: 10px; + text-align: : center; + z-index: 5; + +} + +.grid-container > div { + position: relative; + text-align: center; + z-index: 5; +} + +.thumbborder { + max-height: 100%; + position:relative; + display: inline-block; + max-width: 300px; } + .img { display: inline-block; border-style: hidden hidden solid hidden; @@ -50,5 +82,6 @@ body { width: 300px; overflow-wrap: break-word; border-style: hidden; + text-align: left; } From 3d6d7ac5fc011e42f9e241389c25d2f4279872eb Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Sat, 18 Apr 2020 01:00:21 +0200 Subject: [PATCH 08/11] Ioana#3 --- templates/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/timeline.html b/templates/timeline.html index debf6ad..4f5c1d8 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -9,7 +9,7 @@ {{ page.name }} -

{{ page.name }}

+

Timeline

{{ body|safe }}
From b71558cca8c00710cd12602cb0d2ededf4de2873 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Sat, 18 Apr 2020 01:06:44 +0200 Subject: [PATCH 09/11] Ioana#4 --- templates/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/timeline.html b/templates/timeline.html index 4f5c1d8..14ed557 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -6,7 +6,7 @@ - {{ page.name }} + Timeline

Timeline

From e1e1d6d9de732c04553765387e942ee59dba9615 Mon Sep 17 00:00:00 2001 From: Sandra Date: Sat, 18 Apr 2020 01:29:28 +0200 Subject: [PATCH 10/11] padding n stuff --- static/title.css | 13 ++++++++----- static/topicformat.css | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/static/title.css b/static/title.css index 5776814..e6d5b19 100644 --- a/static/title.css +++ b/static/title.css @@ -14,6 +14,7 @@ body { left: 7%; text-align: : center; z-index: 5; + padding-bottom: 5%; } @@ -21,12 +22,14 @@ body { position: relative; text-align: center; z-index: 5; + } .thumbborder { position: relative; max-width: 100%; max-height: 100%; + } @@ -123,7 +126,7 @@ h2{ position: fixed; /* text-align: center;*/ bottom: 0%; - right: 0%; + right: 1%; z-index: 9; width: 110px; height: 50px; @@ -141,7 +144,7 @@ p { .btnov { position: fixed; display: inline; - right: 0px; + right: 20px; bottom:0px; border: none; width: 50px; @@ -159,7 +162,7 @@ p { .btn { position: fixed; display: inline; - right: 60px; + right: 70px; bottom:0px; border: none; width: 50px; @@ -247,8 +250,8 @@ a.content:link { color:white; } -.metadata_organization { - /*font-size: 14px;*/ +.metadata_topic, .metadata_format, .metadata_creator, .metadata_organization { + max-width: 95%; } .fbtn { diff --git a/static/topicformat.css b/static/topicformat.css index bc5803c..5576c06 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -41,6 +41,7 @@ body { margin-right: 10px; text-align: : center; z-index: 5; + padding-bottom: 5%; } From 2b307f969f71f9cd7780d1cab292c163831668a3 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Sat, 18 Apr 2020 01:48:19 +0200 Subject: [PATCH 11/11] Padding top --- static/orgs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/orgs.css b/static/orgs.css index d625c89..6950579 100644 --- a/static/orgs.css +++ b/static/orgs.css @@ -1,6 +1,6 @@ #top { - padding-top: 20px; + padding-top: 25px; padding-left: 50px; } @@ -104,3 +104,4 @@ button.bottom span, button.top span { .scbt { visibility: hidden; } +