Your Name 5 years ago
commit 802a5248c2

@ -1,3 +1,89 @@
<<<<<<< HEAD
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;
}
=======
body{ body{
width: max-content; width: max-content;
background-color: #F4EBE8; background-color: #F4EBE8;
@ -83,3 +169,4 @@ display: inline-block;
height: auto; height: auto;
} }
>>>>>>> 86577e11087078ad95a30c5f9400661fcc23c03d

@ -1,3 +1,20 @@
<<<<<<< HEAD
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="{{ staticpath }}/static/archive.css" />
<link rel="stylesheet" href="{{ staticpath }}/static/timeline.css" />
<link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
<title>Timeline</title>
</head>
<body>
<div class="pagelink">Timeline</div>
<div id="body">{{ body|safe }}</div>
</body>
</html>
=======
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -14,3 +31,4 @@
</body> </body>
</html> </html>
>>>>>>> 86577e11087078ad95a30c5f9400661fcc23c03d

Loading…
Cancel
Save