From 26428d2c52be2a7d755b6993460952affe1739a8 Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 12:29:33 +0200 Subject: [PATCH 01/14] css changes --- static/archive.css | 3 ++- static/topicformat.css | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/static/archive.css b/static/archive.css index f0042b1..a094449 100644 --- a/static/archive.css +++ b/static/archive.css @@ -51,13 +51,14 @@ h1 { top:5%; text-align: right; background-color: rgba(11,239,235,0.7); + color: #371F10; padding: 3px 35px 3px 10px; z-index: 10; font-size: 28px; } a, a:visited{ - color:black; + color:#371F10; text-decoration: underline; } diff --git a/static/topicformat.css b/static/topicformat.css index 060f0da..fe599a9 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -7,13 +7,13 @@ body { .grid-container { display: inline-grid; - grid-template-columns: repeat(8, 1fr); + grid-template-columns: repeat(3, 1fr); grid-column-gap: 5px; grid-row-gap: 120px; grid-auto-flow: dense; position: relative; top: 60%; - left: 30% + left: 5%; height: auto; text-align: : center; @@ -73,10 +73,8 @@ h1 { right:0%; top:3%; text-align: right; - background-color: #0BEFEB; - opacity: 0.5; + background-color: rgba(11,239,235,0.7); padding: 3px 30px 3px 10px; z-index: 10; font-size: 32px; } - From 377c27a52931bf7c2b746cd4b8f77b2f15e07da8 Mon Sep 17 00:00:00 2001 From: Sandra Date: Fri, 17 Apr 2020 13:45:50 +0200 Subject: [PATCH 02/14] view btns --- static/title.css | 79 ++++++++++++++++++++++++++------------------ templates/title.html | 7 ++-- 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/static/title.css b/static/title.css index 9c816d6..0e482cf 100644 --- a/static/title.css +++ b/static/title.css @@ -11,7 +11,7 @@ body { top: 25%; width: 82%; height: auto; - right: 8%; + left: 7%; text-align: : center; z-index: 5; @@ -32,33 +32,32 @@ body { /*links*/ -a:link { +/*a:link { text-decoration: none; - color: black; + color: #371F10; } a:visited { text-decoration: none; - color: black; + color: #371F10; } a:hover { text-decoration: none; color: blue; -} +}*/ h1 { - position: fixed; + /*position: fixed; right:0%; top:5%; text-align: right; background-color: rgba(11,239,235,0.7); padding: 3px 35px 3px 10px; z-index: 10; - color: black; font-size: 27px; - color: #371F10; + color: #371F10;*/ max-width: 90%; } @@ -71,29 +70,27 @@ h2{ padding: 3px 35px 3px 10px; z-index: 10; font-size: 20px; - /* opacity: 0.7;*/ - color: #371F10; + color: #371F10; } .viewnav { position: fixed; - bottom: 0%; - left: 0%; + bottom: 1%; + right: 1%; background-color: transparent; - width: 10%; - z-index: 10; - opacity: 0.7; + width: 5%; + z-index: 9; } .collapsible2 { - background-color: transparent; - color: red; + background-color: transparent; + color: #371F10; cursor: pointer; padding: 0px; width: 100%; height: auto; border: none; - text-align: left; + text-align: center; outline: none; font-size: 40px; z-index: 10; @@ -109,19 +106,19 @@ h2{ position: absolute; max-height: 0; overflow: hidden; - width: 100%; + width: auto; transition: max-height 0.3s ease-out; background-color: transparent; color: white; z-index: 10; text-align: center; - bottom: 50%; + bottom: 100%; } /* Grid buttons */ -.header { +/*.header { position: absolute; text-align: center; @@ -132,35 +129,51 @@ h2{ width: auto; height: auto; background-color: pink; -} +}*/ p { display: inline-block; position: relative; } +.btnov { + border: none; + outline: none; + width: 110px; + text-align: center; + padding: 0px 0px; + background-color: transparent; + cursor: pointer; + font-size: 20px; + margin-right: 5px; + z-index: 9; + color: #371F10; + + +} + .btn { border: none; outline: none; width: 110px; text-align: center; - padding: 12px 0px; + padding: 0px 0px; background-color: transparent; cursor: pointer; - font-size: 18px; + font-size: 30px; margin-right: 5px; z-index: 9; - border: solid 1px; + color: #371F10; + } .btn:hover { - background-color: black; - color: blue; + color:rgba(11,239,235); +/* color: blue;*/ } .btn:active { - background-color: black; - color: white; + color:rgba(11,239,235); } @@ -183,7 +196,7 @@ p { display: inline-block; right:0%; background-color: white; - color: black; + color: #371F10; cursor: pointer; padding: 18px; width: 3%; @@ -198,7 +211,7 @@ p { } .active, .collapsible:hover { - background-color: #0BEFEB; + color: blue; } @@ -210,7 +223,7 @@ p { width: auto; transition: max-height 0.2s ease-out; background-color: white; - color: black; + color: #371F10; z-index: 10; text-align: left; opacity: 0.7; @@ -223,7 +236,7 @@ a.content:link { } .metadata_organization { - font-size: 14px; + /*font-size: 14px;*/ } .fbtn { diff --git a/templates/title.html b/templates/title.html index 4d489ca..dbd2fdd 100644 --- a/templates/title.html +++ b/templates/title.html @@ -14,11 +14,10 @@

{{ page.name }} ↵

-
❏
+
▢
- -

-

+

+

From b53694bbd67bf84a8129d68a457e5ffaff1c1b3d Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 17 Apr 2020 15:40:31 +0200 Subject: [PATCH 03/14] centeringstuff --- static/about.css | 25 ++++++++++--- static/archive.css | 90 ++++++++++++++++++++++++++++++++++++++++++---- static/index.css | 62 ++------------------------------ 3 files changed, 107 insertions(+), 70 deletions(-) diff --git a/static/about.css b/static/about.css index 50782d6..e0fa078 100644 --- a/static/about.css +++ b/static/about.css @@ -1,8 +1,10 @@ body { background-color: #F4EBE8; font-family: Roboto Mono; + } + .projtextcont{ display: block; /*align-items: center; @@ -16,7 +18,6 @@ display: block; width: 80%; display: block; text-align: justify; - } h1{ @@ -31,7 +32,7 @@ h1{ top:0%; z-index: 0; margin:0px; - margin-top: 50px; + /*margin-top: 50px;*/ } h2{ @@ -41,7 +42,7 @@ h2{ text-align: justify; } -.pagelink{ +/*.pagelink{ position: fixed; display: inline; left:0px; @@ -55,7 +56,7 @@ h2{ border-top-style: solid; border-right-style: solid; border-bottom-style: solid; - /*border-style: solid;*/ + /*border-style: solid; border-width: 1px; border-color: #371F10; @@ -64,10 +65,24 @@ h2{ .pagelink:hover{ background-color: #0BEFEB; } + +.pagelink{ + background-color: white; +} + .pagelink a{ text-decoration: none; } +/*.pagelink a:active{ + background-color: #0BEFEB; +} + +.active .pagelink:after{ + background-color: #0BEFEB; +} + + .pagelink .pagename{ display: inline; position: absolute; @@ -81,4 +96,4 @@ h2{ .pagelink:hover .pagename{ visibility: visible; -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/static/archive.css b/static/archive.css index 0c99a6b..0281b98 100644 --- a/static/archive.css +++ b/static/archive.css @@ -3,12 +3,12 @@ body { color: #371F10; font-family: Roboto Mono, monospace; } -.pagelink{ +/*.pagelink{ position: fixed; display: inline; left:0px; /* width:20px; - height:20px;*/ + height:20px; padding: 0px 5px 0px 5px; background-color: white; z-index: 10; @@ -17,13 +17,13 @@ body { border-top-style: solid; border-right-style: solid; border-bottom-style: solid; - /*border-style: solid;*/ + /*border-style: solid; border-width: 1px; border-color: #371F10; -} +}*/ -.pagelink:hover{ +/*.pagelink:hover{ background-color: #0BEFEB; } .pagelink a{ @@ -43,6 +43,83 @@ body { .pagelink:hover .pagename{ visibility: visible; +}*/ + +.linkscont{ + margin-top: 10%; + height: auto; + width: auto; + position: fixed; + left:0%; +} + +.pagelink{ +/* display:table-cell; + text-align:center; + vertical-align:middle;*/ + display: inline-flex; + justify-content: center; + align-items: center; + position: fixed; + /*display: block;*/ + left:0px; + width:25px; + height:25px; + padding:10px; + background-color: white; + z-index: 2; + font-size: 24px; + /*text-align: justify;*/ + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + /*border-style: solid;*/ + border-width: 1px; + border-color: #371F10; + +} + +.pagelink:hover{ + background-color: #0BEFEB; +} + +.pagelink{ + background-color: white; +} + +.pagelink a{ + text-decoration: none; +} + +/*.pagelink a:active{ + background-color: #0BEFEB; +} + +.active .pagelink:after{ + background-color: #0BEFEB; +}*/ + +.pagename{ +align-items: center; +width:auto; +text-align: left; +} + +.pagelink .pagename{ + display: inline; + position: absolute; + width: auto; + padding: 5px; + margin-left: 160px; + font-size: 12px; + background-color: white; + visibility: hidden; + white-space: nowrap; +} + +.pagelink:hover .pagename{ + visibility: visible; + z-index: 20; } h1 { @@ -66,4 +143,5 @@ a:hover { color: blue; } -a.image {cursor: default!important;} /* KEEP THIS: it is important to avoid images to seeming like links */ \ No newline at end of file +a.image {cursor: default!important;} /* KEEP THIS: it is important to avoid images to seeming like links */ + diff --git a/static/index.css b/static/index.css index 084402c..aec11cc 100644 --- a/static/index.css +++ b/static/index.css @@ -38,31 +38,8 @@ display: inline-block; line-height: 1.3; } -/*.smw-row:nth-child(odd) { - background-color: purple; - float: right; -} -.smw-row:nth-child(odd) img { - float: right; -} -.smw-row:nth-child(even) { - background-color: orange; - float: left; -}*/ -.nav .active{ - /*font-family: helvetica;*/ - margin-left: 20px; - color: black; - text-decoration: underline; -} - -.navtab{/* - font-family: helvetica;*/ - margin-left: 20px; - color: grey; -} -.pagelink{ +/*.pagelink{ position: fixed; display: inline; left:0px; @@ -76,7 +53,7 @@ display: inline-block; border-top-style: solid; border-right-style: solid; border-bottom-style: solid; - /*border-style: solid;*/ + /*border-style: solid; border-width: 1px; border-color: #371F10; @@ -102,7 +79,7 @@ display: inline-block; .pagelink:hover .pagename{ visibility: visible; -} +}*/ .tooltip { position: relative; @@ -139,34 +116,7 @@ display: inline-block; visibility: visible; } -/*ul#nav li{ - display: inline; - list-style: none; - margin-left: 10px; -/* margin-left: 10% - margin-right: 10%; - align-content: initial; - font-size: 20px; - -} -ul#nav{ - padding: 20px; - margin-top: 10px; - margin-bottom: 20px; - background-color: white; - top:0px; - bottom: 10px; - padding-left: 0px; - border: none; - width: 80vw; - /*display: inline; - height:20px; - /*overflow-x: scroll; - left:0px; - position: fixed; - z-index: 1; -}*/ ul#menu li{ display: inline; @@ -243,12 +193,6 @@ display: inline-block; box-shadow: 10px 10px 15px #0BEFEB; } -/*.container { -margin-left: 40px; - margin-top: 20px; - overflow: hidden; -}*/ - /* Style the buttons */ From 44258c51851388f2cf34b0d736e2cb5850ca9297 Mon Sep 17 00:00:00 2001 From: Sandra Date: Fri, 17 Apr 2020 15:56:36 +0200 Subject: [PATCH 04/14] layout btn --- static/title.css | 255 +++++++++++++++++++++++-------------------- templates/title.html | 26 ++--- 2 files changed, 141 insertions(+), 140 deletions(-) diff --git a/static/title.css b/static/title.css index 0e482cf..3d1a208 100644 --- a/static/title.css +++ b/static/title.css @@ -4,35 +4,35 @@ body { } .grid-container { - display: grid; - grid-template-columns: repeat(4, 1fr); - grid-gap: 10px; - position: absolute; - top: 25%; - width: 82%; - height: auto; - left: 7%; - text-align: : center; - z-index: 5; + display: grid; + grid-template-columns: repeat(4, 1fr); + grid-gap: 10px; + position: absolute; + top: 25%; + width: 82%; + height: auto; + left: 7%; + text-align: : center; + z-index: 5; } .grid-container > div { - position: relative; - text-align: center; - z-index: 5; + position: relative; + text-align: center; + z-index: 5; } .thumbborder { - position: relative; - max-width: 100%; - max-height: 100%; + position: relative; + max-width: 100%; + max-height: 100%; } /*links*/ -/*a:link { +a:link { text-decoration: none; color: #371F10; } @@ -43,58 +43,58 @@ a:visited { } a:hover { - text-decoration: none; - color: blue; -}*/ + text-decoration: none; + color: blue; +} h1 { - /*position: fixed; - right:0%; - top:5%; - text-align: right; - background-color: rgba(11,239,235,0.7); - padding: 3px 35px 3px 10px; - z-index: 10; - font-size: 27px; - color: #371F10;*/ + /*position: fixed; + right:0%; + top:5%; + 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%; } h2{ - position: fixed; - right: 0%; - top: 15%; - text-align: left; - background-color: rgba(11,239,235,0.7); - padding: 3px 35px 3px 10px; - z-index: 10; - font-size: 20px; + position: fixed; + right: 0%; + top: 15%; + text-align: left; + background-color: rgba(11,239,235,0.7); + padding: 3px 35px 3px 10px; + z-index: 10; + font-size: 20px; color: #371F10; } -.viewnav { - position: fixed; - bottom: 1%; - right: 1%; - background-color: transparent; - width: 5%; - z-index: 9; +/*.viewnav { + position: fixed; + bottom: 1%; + right: 1%; + background-color: transparent; + width: 5%; + z-index: 9; } .collapsible2 { background-color: transparent; - color: #371F10; - cursor: pointer; - padding: 0px; - width: 100%; - height: auto; - border: none; - text-align: center; - outline: none; - font-size: 40px; - z-index: 10; - margin-top: 0px; + color: #371F10; + cursor: pointer; + padding: 0px; + width: 100%; + height: auto; + border: none; + text-align: center; + outline: none; + font-size: 40px; + z-index: 10; + margin-top: 0px; } .collapsible2:hover { @@ -113,58 +113,63 @@ h2{ z-index: 10; text-align: center; bottom: 100%; -} +}*/ /* Grid buttons */ -/*.header { - - position: absolute; - text-align: center; - padding: 32px; - top: 30%; - right: 0%; - z-index: 9; - width: auto; - height: auto; - background-color: pink; -}*/ +.header { + + position: fixed; + /* text-align: center;*/ + bottom: 0%; + right: 0%; + z-index: 9; + width: 110px; + height: 50px; + background-color: white; + color: #371F10; + +} p { - display: inline-block; - position: relative; + display: inline-block; + /*position: relative;*/ + color: #371F10; } .btnov { + position: fixed; + display: inline; + right: 0px; + bottom:0px; border: none; - outline: none; - width: 110px; + width: 50px; + height: 50px; text-align: center; - padding: 0px 0px; + /* padding: 5px 5px;*/ background-color: transparent; cursor: pointer; font-size: 20px; - margin-right: 5px; z-index: 9; color: #371F10; - - + margin-bottom: 3px; } .btn { + position: fixed; + display: inline; + right: 60px; + bottom:0px; border: none; - outline: none; - width: 110px; + width: 50px; + height: 50px; text-align: center; - padding: 0px 0px; background-color: transparent; cursor: pointer; font-size: 30px; - margin-right: 5px; z-index: 9; color: #371F10; - } .btn:hover { @@ -176,25 +181,33 @@ p { color:rgba(11,239,235); } +.btnov:hover { + color:rgba(11,239,235); +/* color: blue;*/ +} + +.btnov:active { + color:rgba(11,239,235); +} .metadata{ - position: fixed; - top: 25%; - right: 0%; - background-color: transparent; - width: 60%; - z-index: 10; - opacity: 1; - text-align: right; - /*align-items: right; - align-content: right;*/ + position: fixed; + top: 25%; + right: 0%; + background-color: transparent; + width: 60%; + z-index: 10; + opacity: 1; + text-align: right; + /*align-items: right; + align-content: right;*/ } .collapsible { - - display: inline-block; - right:0%; + + display: inline-block; + right:0%; background-color: white; color: #371F10; cursor: pointer; @@ -211,8 +224,8 @@ p { } .active, .collapsible:hover { - color: blue; - + color: #371F10; + background-color:rgba(11,239,235); } .content { @@ -232,29 +245,29 @@ p { } a.content:link { - color:white; + color:white; } .metadata_organization { - /*font-size: 14px;*/ + /*font-size: 14px;*/ } .fbtn { - font-style: italic; + font-style: italic; } .smw-template-furtherresults { - display: none; + display: none; } /* .orglink { - position: fixed; - top: 30%; - left: 0%; - background-color: white; - z-index: 10; - font-size: 30px; - padding: 0px 5px 0px 5px; + position: fixed; + top: 30%; + left: 0%; + background-color: white; + z-index: 10; + font-size: 30px; + padding: 0px 5px 0px 5px; } .orglink .htext { @@ -278,13 +291,13 @@ a.content:link { } .timelinelink { - position: fixed; - top: 20%; - left: 0%; - background-color: white; - z-index: 10; - font-size: 30px; - padding: 0px 5px 0px 5px; + position: fixed; + top: 20%; + left: 0%; + background-color: white; + z-index: 10; + font-size: 30px; + padding: 0px 5px 0px 5px; } .timelinelink .htext { @@ -308,13 +321,13 @@ a.content:link { } .indexlink { - position: fixed; - top:10%; - left:0%; - background-color: white; - z-index: 10; - font-size: 30px; - padding: 0px 5px 0px 5px; + position: fixed; + top:10%; + left:0%; + background-color: white; + z-index: 10; + font-size: 30px; + padding: 0px 5px 0px 5px; } .indexlink .htext { diff --git a/templates/title.html b/templates/title.html index dbd2fdd..5a28054 100644 --- a/templates/title.html +++ b/templates/title.html @@ -13,14 +13,15 @@

{{ page.name }} ↵

-
+ +
+

+

-
-
+
{{ body|safe }}
@@ -40,20 +41,7 @@ for (i = 0; i < coll.length; i++) { }); } -var coll = document.getElementsByClassName("collapsible2"); -var i; -for (i = 0; i < coll.length; i++) { - coll[i].addEventListener("click", function() { - this.classList.toggle("active"); - var content = this.nextElementSibling; - if (content.style.maxHeight){ - content.style.maxHeight = null; - } else { - content.style.maxHeight = content.scrollHeight + "px"; - } - }); -} From d56cd300da8bdc1211d486154a92e2b2cad2bbb8 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 16:07:12 +0200 Subject: [PATCH 05/14] ---- --- static/orgs.css | 33 +++++++++++++++++---------------- templates/orgs.html | 8 ++++---- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/static/orgs.css b/static/orgs.css index 8110433..333058e 100644 --- a/static/orgs.css +++ b/static/orgs.css @@ -10,21 +10,6 @@ body { font-size:14px; } -/* Page title */ -h1 { - position: fixed; - right:0%; - top:5%; - text-align: right; - background-color: #0BEFEB; - padding: 3px 35px 3px 10px; - z-index: 10; - color: black; - font-size: 28px; - opacity: 0.7; - color: #371F10; -} - /* Organizations list */ .collapsible{ padding-left: 70px; @@ -89,6 +74,9 @@ h1 { margin-top: 10px; height: 60px; width: 60px; + padding-bottom: 15px; + font-weight: bold; + font-size: 17px; } .scrl:hover { @@ -105,11 +93,24 @@ h1 { border-radius: 6px; padding: 5px 0; font-size: 15px; - right: 50px; + right: 65px; z-index: 10; position: absolute; } .scrl:hover > .scbt { visibility: visible; +} + +button.up span { + position:relative; bottom: 20%; +} + +button.down span { + position:relative; left: 60%; +} + +button.bottom span { + position:relative; bottom: 27%; + position:relative; left: 27%; } \ No newline at end of file diff --git a/templates/orgs.html b/templates/orgs.html index 42ace11..22fce7f 100644 --- a/templates/orgs.html +++ b/templates/orgs.html @@ -13,10 +13,10 @@

{{ page.name }}

- - - - + + + +
{{ body|safe }}
From 209f85434fd2212663e21ba0b3f129b1e1e81d34 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 17 Apr 2020 16:14:43 +0200 Subject: [PATCH 06/14] z index --- static/archive.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/archive.css b/static/archive.css index 0281b98..cec009b 100644 --- a/static/archive.css +++ b/static/archive.css @@ -51,6 +51,7 @@ body { width: auto; position: fixed; left:0%; + z-index: 10; } .pagelink{ @@ -119,6 +120,7 @@ text-align: left; .pagelink:hover .pagename{ visibility: visible; + position: absolute; z-index: 20; } From 765468b821ca04a32ee0e9e423020b1af37f4aa4 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 16:21:35 +0200 Subject: [PATCH 07/14] z --- templates/orgs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/orgs.html b/templates/orgs.html index 22fce7f..2d391b8 100644 --- a/templates/orgs.html +++ b/templates/orgs.html @@ -1,5 +1,5 @@ - + From 4b88dc81ef11fd1a1c17fa3b41602e7a658c5252 Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 16:24:28 +0200 Subject: [PATCH 08/14] stat template stat css --- static/stats.css | 47 +++++++++++++++++++++++++++++++++++++++ templates/statistics.html | 17 ++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 templates/statistics.html diff --git a/static/stats.css b/static/stats.css index e69de29..be0d2d3 100644 --- a/static/stats.css +++ b/static/stats.css @@ -0,0 +1,47 @@ +body { + background-color: #F4EBE8; + font-family: Roboto Mono, monospace; + font-size:20px; + padding-top: 200px; + padding-left: 120px; + padding-right: 120px; +} + +#statbody { + display: flex; +} + +.statcontainer { + display: inline-block; + width: 50%; + padding: 20px; + align-items: center; +} +.counter { + display: flex; + width: 100% +} + +.box { + display: inline-block; + width: 40%; + text-align: center; + padding: 20px; + +} + +.number { + font-size: 72px; +} + +#graphs { + width: 100%; +} + +.image{ + display: inline-block; + width: 100%; +} +#counter { + display: inline-block; +} diff --git a/templates/statistics.html b/templates/statistics.html new file mode 100644 index 0000000..e6afcb6 --- /dev/null +++ b/templates/statistics.html @@ -0,0 +1,17 @@ + + + + + + + + + {{ page.name }} + + + +

{{ page.name }}

+
{{ body|safe }}
+ + + From feb863723d8d76cc11df38da502b77db76e81bcc Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 16:37:45 +0200 Subject: [PATCH 09/14] css changes to topicformat.css --- static/topicformat.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/static/topicformat.css b/static/topicformat.css index fe599a9..4c432ac 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -3,6 +3,7 @@ body { padding-top: 120px; padding-left: 120px; padding-right: 120px; + font-size: 18px; } .grid-container { @@ -36,8 +37,6 @@ body { .title { display:block; - font-size: large; - font-weight: 700; } .tooltiptext { @@ -55,17 +54,18 @@ body { /*links*/ a:link { - text-decoration: none; + text-decoration: underline; + color: #371F10; } a:visited { text-decoration: none; + color: #371F10; } a:hover { - background-color: #0BEFEB; - opacity: 0.7; - color: white; + text-decoration: none; + color: blue; } h1 { @@ -76,5 +76,5 @@ h1 { background-color: rgba(11,239,235,0.7); padding: 3px 30px 3px 10px; z-index: 10; - font-size: 32px; + : 32px; } From b8b40746cb1f35c70c054ebe8174374829303ece Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 16:50:28 +0200 Subject: [PATCH 10/14] css Changes --- static/stats.css | 2 +- static/topicformat.css | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/static/stats.css b/static/stats.css index be0d2d3..f48db5d 100644 --- a/static/stats.css +++ b/static/stats.css @@ -2,7 +2,7 @@ body { background-color: #F4EBE8; font-family: Roboto Mono, monospace; font-size:20px; - padding-top: 200px; + padding-top: 120px; padding-left: 120px; padding-right: 120px; } diff --git a/static/topicformat.css b/static/topicformat.css index 4c432ac..bfc1e24 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -51,23 +51,6 @@ body { border-style: hidden; } -/*links*/ - -a:link { - text-decoration: underline; - color: #371F10; -} - -a:visited { - text-decoration: none; - color: #371F10; -} - -a:hover { - text-decoration: none; - color: blue; -} - h1 { position: fixed; right:0%; From 9deaa7508455c0626e28eca8630b811a2e749944 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 18:13:48 +0200 Subject: [PATCH 11/14] Buttons --- static/orgs.css | 72 +++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/static/orgs.css b/static/orgs.css index 333058e..6ad320d 100644 --- a/static/orgs.css +++ b/static/orgs.css @@ -53,64 +53,52 @@ body { cursor: pointer; } -/* Scroll column */ -.scrollcolumn { - position: fixed; - display: inline; - top:35%; - right:0%; - width: 60px; - outline: none; - z-index: 10; - text-align: center; -} - /* Scroll buttons */ .scrl { + position: fixed; background-color: white; + color:#371F10; cursor: pointer; border:none; - font-size: 15px; - margin-top: 10px; - height: 60px; - width: 60px; - padding-bottom: 15px; + font-size: 25px; + width: 50px; + height: 50px; font-weight: bold; - font-size: 17px; + z-index: 10; + bottom: 0%; } .scrl:hover { - background-color: #0BEFEB; + color: #0BEFEB; } -/* Scroll button title */ -.scbt { - visibility: hidden; - width: 120px; - background-color: black; - color: #fff; - text-align: center; - border-radius: 6px; - padding: 5px 0; - font-size: 15px; - right: 65px; - z-index: 10; - position: absolute; +button.down span, button.up span { + position:relative; left: 30%; + position:relative; bottom: 65%; +} + +.up { + right: 51px; +} + +.down { + right: 0%; } -.scrl:hover > .scbt { - visibility: visible; +button.bottom span, button.top span { + position:relative; left: 15%; + position:relative; bottom: 65%; } -button.up span { - position:relative; bottom: 20%; +.top { + right: 153px; } -button.down span { - position:relative; left: 60%; +.bottom { + right: 102px; } -button.bottom span { - position:relative; bottom: 27%; - position:relative; left: 27%; -} \ No newline at end of file +/* Scroll button title */ +.scbt { + visibility: hidden; +} From 2180fdaa0932f2091853f0d912b05eade146fff4 Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 18:33:59 +0200 Subject: [PATCH 12/14] Ioana --- static/timeline.css | 178 +++++++++++++++++++--------------------- templates/timeline.html | 31 +++---- 2 files changed, 101 insertions(+), 108 deletions(-) diff --git a/static/timeline.css b/static/timeline.css index 9f6bc3e..889e32d 100644 --- a/static/timeline.css +++ b/static/timeline.css @@ -1,93 +1,85 @@ -body{ - width: max-content; - background-color: #F4EBE8; -} - -h1 { - font-family: Roboto Mono; - font-size: 40px; - margin-top: 1%; -} - -.pagetitle { - position: fixed; - right:0%; - top:5%; - text-align: right; - background-color: #0BEFEB; - padding: 3px 35px 3px 10px; - z-index: 10; - color: black; - font-size: 28px; - opacity: 0.7; -} - -div#body{ width: max-content;} - -.mw-parser-output{ - /*! position: left top; */ - /*! display: hidden; */ - /*! display: inline; */ - /*! vertical-align: top; */ -} - -.mw-parser-output > p{ -display: inline-block; -} - -.content { - display: flex; - margin-right: 5vw; -} - -.indexlink { - position: fixed; - font-size: 20px; - bottom: 0%; - right: 3%; - background-color: transparent; - border: none; - border-right-color: transparent; - z-index: 10; - padding: 0px 30px 20px 10px - border: none; -} - -.indexlink a { - text-decoration: none; -} - -.event { - margin-top: 3%; - text-align-last: auto; - font-family: Roboto Mono; - font-size: 10px; - padding-left: 5vw; - display: inline-block; - width:200px; - vertical-align: top; -} - -.pubpageinfo { - - padding-top: 10px; - font-size: 15px; -} - -.pubpageinfo:hover { - background-color: #0BEFEB; - padding: 10px; -} - -.thumbborder { - box-shadow: 10px 10px 15px #C4BCB9; - width: 40%; - height: auto; -} - -.thumbborder:hover { - box-shadow: 10px 10px 15px #0BEFEB; - width:100%; - transition:0.5s; - height: auto; -} +body{ + width: max-content; + background-color: #F4EBE8; +} + +h1 { + font-family: Roboto Mono; + font-size: 40px; + margin-top: 1%; +} + +h2 { + font-size: 17px; + background-color: #0BEFEB; + padding: 5px; +} + +div#body{ width: max-content;} + +.mw-parser-output{ + /*! position: left top; */ + /*! display: hidden; */ + /*! display: inline; */ + /*! vertical-align: top; */ +} + +.mw-parser-output > p{ +display: inline-block; +} + +.content { + display: flex; + margin-right: 10vw; + margin-left: 5vw; +} + +.indexlink { + position: fixed; + font-size: 20px; + bottom: 0%; + right: 3%; + background-color: transparent; + border: none; + border-right-color: transparent; + z-index: 10; + padding: 0px 30px 20px 10px + border: none; +} + +.indexlink a { + text-decoration: none; +} + +.event { + margin-top: 3%; + text-align-last: auto; + font-family: Roboto Mono; + font-size: 10px; + padding-left: 5vw; + display: inline-block; + width:200px; + vertical-align: top; +} + +.eventfirstpages { + padding-bottom: 5vh; +} + +.pubpageinfo { + font-size: 15px; +} + +.thumbborder { + box-shadow: 10px 10px 15px #C4BCB9; + width: 40%; + height: auto; +} + +.thumbborder:hover { + box-shadow: 10px 10px 15px #0BEFEB; + width:100%; + transition:0.5s; + height: auto; +} + diff --git a/templates/timeline.html b/templates/timeline.html index 8b6b655..5c58fc1 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -1,15 +1,16 @@ - - - - - - - - Timeline - - -
┉Timeline
-
{{ body|safe }}
- - - + + + + + + + + Timeline + + +
Timeline
+
{{ body|safe }}
+ + + + From 5fc6231bee52f64c0377a131425ff6c7af93d7c6 Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 18:34:31 +0200 Subject: [PATCH 13/14] fixed margin issue on stats --- static/topicformat.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/static/topicformat.css b/static/topicformat.css index bfc1e24..335bce8 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -1,8 +1,5 @@ body { background-color: #F4EBE8; - padding-top: 120px; - padding-left: 120px; - padding-right: 120px; font-size: 18px; } @@ -16,7 +13,8 @@ body { top: 60%; left: 5%; height: auto; - + margin-left: 120px; + margin-right: 120px; text-align: : center; z-index: 5; From 86577e11087078ad95a30c5f9400661fcc23c03d Mon Sep 17 00:00:00 2001 From: Damlanur Date: Fri, 17 Apr 2020 18:39:04 +0200 Subject: [PATCH 14/14] stats css Changes --- static/stats.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/static/stats.css b/static/stats.css index f48db5d..d33221d 100644 --- a/static/stats.css +++ b/static/stats.css @@ -2,21 +2,24 @@ body { background-color: #F4EBE8; font-family: Roboto Mono, monospace; font-size:20px; - padding-top: 120px; - padding-left: 120px; - padding-right: 120px; + } #statbody { display: flex; + margin: 120px; + float: left } .statcontainer { display: inline-block; width: 50%; + min-height: 900px; padding: 20px; align-items: center; + } + .counter { display: flex; width: 100%