From 22c98251121e1409a0acb43731b1563ba116ad5f Mon Sep 17 00:00:00 2001 From: ioanatomici Date: Fri, 17 Apr 2020 20:53:23 +0200 Subject: [PATCH 1/6] edited timeline css and html templates --- static/timeline.css | 27 +++++++++------------------ templates/timeline.html | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/static/timeline.css b/static/timeline.css index 9f6bc3e..475c314 100644 --- a/static/timeline.css +++ b/static/timeline.css @@ -9,17 +9,10 @@ h1 { margin-top: 1%; } -.pagetitle { - position: fixed; - right:0%; - top:5%; - text-align: right; +h2 { + font-size: 17px; background-color: #0BEFEB; - padding: 3px 35px 3px 10px; - z-index: 10; - color: black; - font-size: 28px; - opacity: 0.7; + padding: 5px; } div#body{ width: max-content;} @@ -37,7 +30,8 @@ display: inline-block; .content { display: flex; - margin-right: 5vw; + margin-right: 10vw; + margin-left: 5vw; } .indexlink { @@ -68,15 +62,12 @@ display: inline-block; vertical-align: top; } -.pubpageinfo { - - padding-top: 10px; - font-size: 15px; +.eventfirstpages { + padding-bottom: 5vh; } -.pubpageinfo:hover { - background-color: #0BEFEB; - padding: 10px; +.pubpageinfo { + font-size: 15px; } .thumbborder { diff --git a/templates/timeline.html b/templates/timeline.html index 8b6b655..8df169d 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -8,7 +8,7 @@ Timeline -
┉Timeline
+
Timeline
{{ body|safe }}
From 61dbe9383be42212736772a83e048b36c13c13ef Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 17 Apr 2020 21:26:12 +0200 Subject: [PATCH 2/6] navigation style --- static/archive.css | 44 +++++++++++++++++++++++++------------------- static/index.css | 10 ++++------ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/static/archive.css b/static/archive.css index 4ade40e..7c24158 100644 --- a/static/archive.css +++ b/static/archive.css @@ -47,7 +47,7 @@ body { .linkscont{ margin-top: 10%; - height: auto; + height: 100vh; width: auto; position: fixed; left:0%; @@ -55,21 +55,20 @@ body { } .pagelink{ -/* display:table-cell; text-align:center; - vertical-align:middle;*/ - display: inline-flex; - justify-content: center; + vertical-align:middle; + display: block; + /*justify-content: center;*/ align-items: center; position: fixed; + /*text-align: left;*/ /*display: block;*/ left:0px; - width:25px; - height:25px; - padding:10px; + width:36px; + height:36px; + padding-top: 2px; background-color: white; - z-index: 2; - font-size: 24px; + z-index: 2; /*text-align: justify;*/ border-top-style: solid; border-right-style: solid; @@ -80,7 +79,19 @@ body { } -.pagelink:hover{ +.icon{ + text-align:center; + vertical-align:middle; + /* display: block;*/ + /*justify-content: center;*/ + align-items: center; +font-size: 24px; +width: 40%; +height: 40%; +vertical-align:middle; +} + +.active, .pagelink:hover{ background-color: #0BEFEB; } @@ -100,18 +111,13 @@ body { background-color: #0BEFEB; }*/ -.pagename{ -align-items: center; -width:auto; -text-align: left; -} .pagelink .pagename{ - display: inline; - position: absolute; + display: inline-block; + position: relative; width: auto; padding: 5px; - margin-left: 160px; + margin-left: 20px; font-size: 12px; background-color: white; visibility: hidden; diff --git a/static/index.css b/static/index.css index aec11cc..9b86e01 100644 --- a/static/index.css +++ b/static/index.css @@ -1,11 +1,6 @@ body { background: white; - max-width: 100%; - height:100%; - display: inline-table; - font-family: Roboto Mono; - bottom: 20px; - scrollbar-width: thin; + height: 100vh; } /*.img { @@ -38,6 +33,9 @@ display: inline-block; line-height: 1.3; } +.linkscont{ +position-top:0px; +} /*.pagelink{ position: fixed; From fae72f67a983fd570a719eaf927aa322a4aa886f Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 21:34:59 +0200 Subject: [PATCH 3/6] btn --- static/orgs.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/static/orgs.css b/static/orgs.css index 6ad320d..e2ab119 100644 --- a/static/orgs.css +++ b/static/orgs.css @@ -60,10 +60,11 @@ body { color:#371F10; cursor: pointer; border:none; + border-right:1px solid #D1C8C8; font-size: 25px; width: 50px; - height: 50px; - font-weight: bold; + height: 50px; + font-weight: bold; z-index: 10; bottom: 0%; } @@ -78,7 +79,7 @@ button.down span, button.up span { } .up { - right: 51px; + right: 53px; } .down { @@ -91,11 +92,11 @@ button.bottom span, button.top span { } .top { - right: 153px; + right: 159px; } .bottom { - right: 102px; + right: 106px; } /* Scroll button title */ From b21b2cc9115da2b2b3ce288fbdf6ea2c6f3c549a Mon Sep 17 00:00:00 2001 From: ioanatomici Date: Fri, 17 Apr 2020 21:38:28 +0200 Subject: [PATCH 4/6] edited timeline css and html templates --- static/timeline.css | 96 ++++++----------------------------------- templates/timeline.html | 21 +-------- 2 files changed, 13 insertions(+), 104 deletions(-) diff --git a/static/timeline.css b/static/timeline.css index 3bdb5fa..8ceb017 100644 --- a/static/timeline.css +++ b/static/timeline.css @@ -1,4 +1,3 @@ -<<<<<<< HEAD body{ width: max-content; background-color: #F4EBE8; @@ -7,96 +6,25 @@ body{ h1 { font-family: Roboto Mono; font-size: 40px; + color: #371F10; 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 { +.pagetitle { position: fixed; - font-size: 20px; - bottom: 0%; - right: 3%; - background-color: transparent; - border: none; - border-right-color: transparent; + right:0%; + top:5%; + text-align: right; + background-color: rgba(11,239,235,0.7); + color: #371F10; + padding: 3px 35px 3px 10px; 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; -} -======= -body{ - width: max-content; - background-color: #F4EBE8; -} - -h1 { - font-family: Roboto Mono; - font-size: 40px; - margin-top: 1%; + font-size: 28px; } h2 { font-size: 17px; + color: #371F10; background-color: #0BEFEB; padding: 5px; } @@ -142,6 +70,7 @@ display: inline-block; text-align-last: auto; font-family: Roboto Mono; font-size: 10px; + color: #371F10; padding-left: 5vw; display: inline-block; width:200px; @@ -154,6 +83,7 @@ display: inline-block; .pubpageinfo { font-size: 15px; + color: #371F10; } .thumbborder { @@ -168,5 +98,3 @@ display: inline-block; transition:0.5s; height: auto; } - ->>>>>>> 86577e11087078ad95a30c5f9400661fcc23c03d diff --git a/templates/timeline.html b/templates/timeline.html index 3014ca5..4efde72 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD @@ -9,26 +8,8 @@ Timeline -
Timeline
+
Timeline
{{ body|safe }}
-======= - - - - - - - - Timeline - - -
Timeline
-
{{ body|safe }}
- - - - ->>>>>>> 86577e11087078ad95a30c5f9400661fcc23c03d From 29ec4c4b24cb3914da86e4b2a7be2ac8a0522c5f Mon Sep 17 00:00:00 2001 From: ioanatomici Date: Fri, 17 Apr 2020 21:59:18 +0200 Subject: [PATCH 5/6] edited timeline css and html templates --- static/timeline.css | 14 +++++++------- templates/timeline.html | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/static/timeline.css b/static/timeline.css index 8ceb017..6086b2b 100644 --- a/static/timeline.css +++ b/static/timeline.css @@ -4,13 +4,6 @@ body{ } h1 { - font-family: Roboto Mono; - font-size: 40px; - color: #371F10; - margin-top: 1%; -} - -.pagetitle { position: fixed; right:0%; top:5%; @@ -22,6 +15,13 @@ h1 { font-size: 28px; } +.eventdate { + font-family: Roboto Mono; + font-size: 40px; + color: #371F10; + margin-top: 1%; +} + h2 { font-size: 17px; color: #371F10; diff --git a/templates/timeline.html b/templates/timeline.html index 4efde72..334248f 100644 --- a/templates/timeline.html +++ b/templates/timeline.html @@ -8,7 +8,7 @@ Timeline -
Timeline
+

Timeline

{{ body|safe }}
From 3ab051345d48ea4c1645bd8749d895998dbcc78c Mon Sep 17 00:00:00 2001 From: "E.zn" Date: Fri, 17 Apr 2020 22:12:30 +0200 Subject: [PATCH 6/6] G --- static/orgs.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/orgs.css b/static/orgs.css index e2ab119..7fd4f49 100644 --- a/static/orgs.css +++ b/static/orgs.css @@ -27,6 +27,7 @@ body { padding-left: 85px; color: #371F10; font-weight: bold; + background-color: transparent; } /* Droped-down publication links */