From 5a9751ca285cc44e5e67e0f5751fd6fec28cdd8d Mon Sep 17 00:00:00 2001 From: Damlanur Date: Thu, 16 Apr 2020 14:22:29 +0200 Subject: [PATCH 1/2] language template added changes 2 css changes 2 templates --- static/topicformat.css | 253 ++++------------------------------------ templates/format.html | 2 +- templates/language.html | 17 +++ templates/topic.html | 2 +- 4 files changed, 42 insertions(+), 232 deletions(-) create mode 100644 templates/language.html diff --git a/static/topicformat.css b/static/topicformat.css index a605bca..001e902 100644 --- a/static/topicformat.css +++ b/static/topicformat.css @@ -1,19 +1,22 @@ body { - background-color: #fcf7e8; + background-color: #F4EBE8; padding-top: 120px; padding-left: 120px; - padding-right: 120px + padding-right: 120px; } + + .grid-container { display: inline-grid; grid-template-columns: repeat(8, 1fr); - grid-column-gap: 10px; + grid-column-gap: 5px; + grid-row-gap: 120px; grid-auto-flow: dense; position: relative; top: 60%; - width: 96%; - height: auto; - left:2%; + left: 30% + height: auto; + text-align: : center; z-index: 5; @@ -29,13 +32,13 @@ body { .img { display: inline-block; border-style: hidden hidden solid hidden; - border-color: #5ce0db; + border-color: #0BEFEB; height: 500px; } .title { display:block; - font-family: 'Work Sans', sans-serif; + font-family: Roboto Mono, monospace; font-size: large; font-weight: 700; } @@ -49,6 +52,7 @@ body { .metatext { display: inline-block; width: 300px; + overflow-wrap: break-word; border-style: hidden; } @@ -72,246 +76,35 @@ a:visited { text-decoration: none; color: black; } - +/* .metatext:hover a { color: white; } - +*/ a:hover { - text-decoration: underline; -} + background-color: #0BEFEB; + opacity: 0.7; + color: white; +} +/* .metatext:hover { - background-color: #5ce0db; + background-color: #0BEFEB; color: white; } - +*/ h1 { position: fixed; right:0%; top:3%; text-align: right; - background-color: #5ce0db; + background-color: #0BEFEB; + opacity: 0.5; padding: 3px 30px 3px 10px; z-index: 10; color: white; font-size: 32px; } -h2{ - position: fixed; - right: 0%; - top: 15%; - text-align: left; - background-color: grey; - color: black; - padding: 3px 3px 3px 30px; - z-index: 10; - font-size: 20px; -} - -/*.indexlist { - position: absolute; - top:20%; -}*/ - -.viewnav { - position: fixed; - top:0%; - right:0%; - background-color: red ; - width: 40%; - z-index: 10; - opacity: 0.7; -} - -.collapsible2 { - background-color: #777; - color: white; - cursor: pointer; - padding: 0px; - width: 100%; - height: px; - border: none; - text-align: left; - outline: none; - font-size: 40px; - z-index: 10; - margin-top: 0px; -} - -.active, .collapsible2:hover { - background-color: #555; -} - -.content2 { - position: relative; - padding: 0px 18px; - max-height: 0; - overflow: hidden; - width: 50%; - transition: max-height 0.2s ease-out; - background-color: grey; - color: white; - z-index: 10; - text-align: left; -} - - -/* Grid buttons */ - -.header { - - position: absolute; - text-align: center; - padding: 32px; - top: 30%; - right: 0%; - z-index: 9; - width: auto; - height: auto; - background-color: pink; -} - -p { - display: block; - position: relative; -} - -.btn { - border: none; - outline: none; - width: 110px; - text-align: center; - padding: 12px 0px; - background-color: grey; - cursor: pointer; - font-size: 18px; - margin-right: 5px; - z-index: 9; -} - -.btn:hover { - background-color: black; - color: blue; -} - -.btn:active { - background-color: black; - color: white; -} - - -.metadata{ - position: fixed; - top:5%; - left:0%; - background-color: ; - width: 40%; - z-index: 10; - opacity: 0.7; -} - -.collapsible { - background-color: #777; - color: white; - cursor: pointer; - padding: 18px; - width: 10%; - height: auto; - border: none; - text-align: right; - outline: none; - font-size: 15px; - z-index: 10; - margin-top: 10px; -} - -.active, .collapsible:hover { - background-color: #555; -} - -.content { - position: relative; - padding: 0px 18px; - max-height: 0; - overflow: hidden; - width: 90%; - transition: max-height 0.2s ease-out; - background-color: grey; - color: white; - z-index: 10; - text-align: right; -} - -a.content:link { - color:white; -} - -.metadata_links { - display: block; - width: 100%; - position: relative; - right: 0%; - padding: 10px; - text-align: left; - /*background-color: blue;*/ - font-size: 18px; - -} - -.metadata_organization { - font-size: 14px; -} - - -.fbtn { - font-style: italic; -} - -.smw-template-furtherresults { - display: none; -} - -.indexlink { - position: fixed; - bottom:0%; - right:3%; - background-color: white; - z-index: 10; - font-size: 30px; -} - -.timelinelink { - position: fixed; - bottom:0%; - right:10%; - background-color: white; - z-index: 10; - font-size: 30px; -} - -.orglink { - position: fixed; - bottom:0%; - left:10%; - background-color: white; - z-index: 10; - font-size: 30px; -} - -.orglink:hover .hiddentext { - visibility: visible; -} - -.hiddentext { - visibility: hidden; - width: 120px; - background-color: black; - color: #fff; - text-align: center; - padding: 5px 0; - border-radius: 6px; -} \ No newline at end of file diff --git a/templates/format.html b/templates/format.html index e713122..de18eb3 100644 --- a/templates/format.html +++ b/templates/format.html @@ -5,7 +5,7 @@ - + {{ page.name }} diff --git a/templates/language.html b/templates/language.html new file mode 100644 index 0000000..de18eb3 --- /dev/null +++ b/templates/language.html @@ -0,0 +1,17 @@ + + + + + + + + + {{ page.name }} + + + +

{{ page.name }}

+
{{ body|safe }}
+ + + diff --git a/templates/topic.html b/templates/topic.html index e713122..de18eb3 100644 --- a/templates/topic.html +++ b/templates/topic.html @@ -5,7 +5,7 @@ - + {{ page.name }} From d9884ef7848bfe7724c884e19d5ca6f1413c95eb Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 16 Apr 2020 14:33:33 +0200 Subject: [PATCH 2/2] about page --- static/about.css | 62 ++++++++++++++++++++++++++++++++++++ static/index.css | 76 +++++++++++++++++++++++++++----------------- templates/about.html | 13 ++++++++ 3 files changed, 121 insertions(+), 30 deletions(-) create mode 100644 static/about.css create mode 100644 templates/about.html diff --git a/static/about.css b/static/about.css new file mode 100644 index 0000000..5aa3c22 --- /dev/null +++ b/static/about.css @@ -0,0 +1,62 @@ +body { + background-color: #F4EBE8; + +} + +.projtextcont{ + display: block; + /*align-items: center; + justify-content: center*/ + margin-left:200px; + font-family: Roboto Mono; + +} + +.projtext{ + width: 50%; + height: 50%; + display: block; + +} + +h1{ + display: block; +} + +.pagelink{ + position: fixed; + display: inline; + left:0px; + width:20px; + height:20px; + padding:10px; + background-color: white; + z-index: 10; + font-size: 18px; + text-align: center; + 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 a{ + text-decoration: none; +} + +.pagelink .pagename{ + display: inline; + position: absolute; + width: auto; + padding: 5px; + margin-left: 25px; + font-size: 13px; + background-color: white; + visibility: hidden; +}s \ No newline at end of file diff --git a/static/index.css b/static/index.css index 1fb3728..3cea8a2 100644 --- a/static/index.css +++ b/static/index.css @@ -5,7 +5,7 @@ body { display: inline-table; font-family: Roboto Mono; bottom: 20px; - + scrollbar-width: thin; } /*.img { @@ -64,27 +64,40 @@ display: inline-block; .pagelink{ position: fixed; - display: inline-block; + display: inline; left:0px; width:20px; + height:20px; padding:10px; background-color: white; z-index: 10; - font-size: 15px; - border-style: solid; + font-size: 18px; + text-align: center; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + /*border-style: solid;*/ border-width: 1px; - border-color: #371F10 + border-color: #371F10; + +} + +.pagelink:hover{ + background-color: #0BEFEB; +} +.pagelink a{ + text-decoration: none; } .pagelink .pagename{ - display: block; + display: inline; position: absolute; - width:auto; + width: auto; padding: 5px; - font-size: 10px; + margin-left: 25px; + font-size: 13px; background-color: white; visibility: hidden; - font-size: 15px; } .pagelink:hover .pagename{ @@ -112,11 +125,11 @@ display: inline-block; padding: 10px; /*border-radius: 6px;*/ /* font-family: CothamSans;*/ - font-size: 18px; + font-size: 16px; position: absolute; /*top: 0px;*/ z-index: 1; - margin-top: 0px; + margin-top:-10px; /*vertical-align: top;*/ line-height: 1.3; word-wrap:break-word @@ -126,12 +139,12 @@ display: inline-block; visibility: visible; } -ul#nav li{ +/*ul#nav li{ display: inline; list-style: none; margin-left: 10px; /* margin-left: 10% - margin-right: 10%;*/ + margin-right: 10%; align-content: initial; font-size: 20px; @@ -147,13 +160,13 @@ ul#nav{ padding-left: 0px; border: none; width: 80vw; - /*display: inline;*/ + /*display: inline; height:20px; - /*overflow-x: scroll;*/ + /*overflow-x: scroll; left:0px; position: fixed; z-index: 1; -} +}*/ ul#menu li{ display: inline; @@ -165,31 +178,29 @@ ul#menu li{ } ul#menu{ - margin-left: 10px; + margin-left: 45px; margin-right: 10px; - top:0px; + top:-15px; bottom: 10px; padding-left: 0px; border: none; - width: 85vw; - /*display: inline;*/ + width: 80vw; height:100%; - /*overflow-x: scroll;*/ left:0px; margin-bottom: 20px; padding-bottom: 20px; position: absolute; - /*z-index: -1; */ + scrollbar-width: thin; } div#myBtnContainer{ - /* background-color: white;*/ + /*background-color: #F4EBE8;*/ /*margin-top: 20px;*/ margin-left: 30px; margin-bottom: 30px; border: none; - width: 15vw; + max-width: 15vw; display: inline; /* visibility: hidden;*/ height:100%; @@ -197,19 +208,24 @@ div#myBtnContainer{ top:0px; position: fixed; padding:10px; - overflow-y: scroll; + overflow-y: hidden; /*z-index: -1;*/ - +overflow-y: scroll; + scrollbar-width: thin; /* overflow-y: hidden;*/ } -div#bigbtncontainer{ +div#myBtnContainer:hover{ + +} + +/*div#bigbtncontainer{ overflow-y: hidden; - -ms-overflow-style: none; /* Internet Explorer 10+ */ + -ms-overflow-style: none; Internet Explorer 10+ scrollbar-width: thin; - /*overflow-y: scroll;*/ + /*overflow-y: scroll; -} +}*/ /*div#myBtnContainer:hover{ background-color: white; z-index: 1; diff --git a/templates/about.html b/templates/about.html new file mode 100644 index 0000000..1d22e9d --- /dev/null +++ b/templates/about.html @@ -0,0 +1,13 @@ + + + + + + + + {{ page.name }} + + + {{ body|safe }} + +