From b21b2cc9115da2b2b3ce288fbdf6ea2c6f3c549a Mon Sep 17 00:00:00 2001 From: ioanatomici Date: Fri, 17 Apr 2020 21:38:28 +0200 Subject: [PATCH] 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