From 40a16f7466d2cb4ebbabdebc80f5367706dc6c37 Mon Sep 17 00:00:00 2001
From: Shraddha <shraddharaghuram@student.tudelft.nl>
Date: Thu, 22 Aug 2024 08:36:30 +0000
Subject: [PATCH] update page.css and fix bugs for navbar
---
static/navbar.css | 3 +-
static/page.css | 216 ++++++++++++++++++++++------------------------
wiki/layout.html | 1 +
3 files changed, 106 insertions(+), 114 deletions(-)
diff --git a/static/navbar.css b/static/navbar.css
index bf34ae1..cfb5ce5 100644
--- a/static/navbar.css
+++ b/static/navbar.css
@@ -54,7 +54,8 @@ body{
height: 50px;
margin-left: 5px;
margin-right: 50px;
- margin-top: 24px;
+ /* margin-top: 24px; */
+ margin-top: 0px;
list-style: none;
}
.my-navbar>li{
diff --git a/static/page.css b/static/page.css
index 83519a5..3b7a3c7 100644
--- a/static/page.css
+++ b/static/page.css
@@ -128,7 +128,7 @@ body{
text-align: center;
margin-bottom: 60px;
}
-/* Katie! */
+
.pagecontent .h-maomao{
width: 100%;
text-align: right;
@@ -345,7 +345,7 @@ body{
top: 0;
width: 100%;
height: 3000px;
- background: url("https://static.igem.wiki/teams/4594/wiki/roster-static/roster-bg-image1.png");
+ background: url("https://static.igem.wiki/teams/5054/team-picture.jpeg");
background-size: contain;
background-position: top center;
background-repeat: no-repeat;
@@ -365,23 +365,23 @@ body{
margin-left: 3.8vw;
}
.roster-title>span{
- font-family: Arlon;
+ font-family: SourceSansPro;
font-size: 8.46vw;
font-style: normal;
font-weight: 600;
line-height: normal;
- color: #F8F0E8;
+ color: #185A4F;
}
.roster-title>p{
text-align: left;
margin-top: 35px;
width: 62%;
- font-family: AlibabaPuHuiTi;
+ font-family: AccidenzCommons;
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: normal;
- color: #F8F0E8;
+ color: #185A4F;
}
.roster-pagecontent{
width: 71%;
@@ -390,7 +390,7 @@ body{
position: relative;
padding: 3.9vw;
border-radius: 30px;
- background-color: #F8F0E8;
+ background-color: #185A4F;
}
.roster-pagecontent-row{
width: 100%;
@@ -419,8 +419,8 @@ body{
}
.roster-name{
margin-top: 10px;
- color: #000;
- font-family: AlibabaPuHuiTi;
+ color: #05BE85;
+ font-family: AccidenzCommons;
/* font-size! */
font-size: 20px;
font-style: normal;
@@ -431,8 +431,8 @@ body{
margin-top: 15px;
}
.roster-infos>p{
- color: #000;
- font-family: AlibabaPuHuiTi;
+ color: #05BE85;
+ font-family: AccidenzCommons;
/* font-size! */
font-size: 15px;
font-style: normal;
@@ -451,15 +451,6 @@ body{
transform: translateY(150px);
transition: all 0.65s ease-in-out;
}
-.roster-maomao-image{
- margin: 0 auto;
- width: 90%;
- height: 150px;
- background: url(https://static.igem.wiki/teams/4594/wiki/bottom-maomao.png);
- background-position: bottom center;
- background-repeat: no-repeat;
- background-size: contain;
-}
@media screen and (min-width:1600px){
.roster-head{
@@ -504,10 +495,10 @@ body{
justify-content: center;
margin: 20vh auto 20px;
width: 88%;
- background-color: #F8F0E8;
+ background-color: #185A4F;
border-radius: 30px 30px 0px 0px;
overflow: hidden;
- box-shadow: 0px 0px 10px 10px #F8F0E8;
+ box-shadow: 0px 0px 10px 10px #185A4F;
}
/* upon */
@@ -519,40 +510,40 @@ body{
/* css for ihp */
/* css for ihp */
-.hp-pagecontainer{
+/* .hp-pagecontainer{
position: relative;
justify-content: center;
margin-top: 10vh;
- padding: 1.5vw;
+ padding: 1.5vw; */
/* border: 1px solid white; */
- width: 80%;
+ /* width: 80%;
margin: 10vh auto 4vh;
}
-.hp-title{
+.hp-title{ */
/* margin-bottom: 10px; */
- transform: translateX(-3.2%);
-}
-.hp-title>span{
+ /* transform: translateX(-3.2%);
+} */
+/* .hp-title>span{
color: transparent;
- font-family: Arlon;
+ font-family: SourceSansPro;
font-size: max(5.8vw, 45px);
font-style: normal;
font-weight: 600;
- -webkit-text-stroke: 3px #F8F0E8;
+ -webkit-text-stroke: 3px #185A4F;
line-height: 135px;
}
.hp-title>p{
margin-top: 35px;
text-align: justify;
- color: #F8F0E8;
+ color: #185A4F;
width: 70%;
- font-family: AlibabaPuHuiTi;
+ font-family: AccidenzCommons;
font-size: min(1.5vw,20px);
font-style: normal;
font-weight: 400;
line-height: normal;
-}
-.hp-contents-container{
+} */
+/* .hp-contents-container{
margin: 10vh auto 60px;
padding-right: 2vw;
}
@@ -560,7 +551,6 @@ body{
height: 440px;
display: block;
margin-bottom: 0px;
- /* 清除inline-blockçš„å½±å“ */
font-size: 0px;
}
.hp-left-content{
@@ -568,17 +558,17 @@ body{
height: 440px;
display: inline-block;
vertical-align: top;
- position: relative;
+ position: relative; */
/* overflow: hidden; */
-}
-.hp-left-content-date{
+/* } */
+/* .hp-left-content-date{
position: absolute;
top: 30px;
left: 0;
}
.hp-left-content-date>span{
- color: #F8F0E8;
- font-family: AlibabaPuHuiTi;
+ color: #185A4F;
+ font-family: AccidenzCommons;
font-size: min(1.5vw,20px);
font-style: normal;
font-weight: 400;
@@ -593,13 +583,13 @@ body{
width: 50px;
height: 50px;
border-radius: 50%;
- background-color: #F8F0E8;
+ background-color: #185A4F;
vertical-align: middle;
}
.hp-left-content-line{
width: 17px;
height: 440px;
- background-color: #B6B2AF;
+ background-color: #185A4F;
transform: translateX(157px);
}
.hp-right-content{
@@ -607,25 +597,25 @@ body{
height: 440px;
display: inline-block;
border-radius: 50px 50px 50px 50px;
- background: #F8F0E8;
+ background: #185A4F;
vertical-align: top;
overflow: hidden;
padding-left: 20px;
padding-right: 20px;
}
.hp-right-content1{
- width: 100%;
+ width: 100%; */
/* 410px + 30 margin = 440px */
- height: 410px;
+ /* height: 410px;
display: block;
border-radius: 50px 50px 0px 0px;
- background: #F8F0E8;
+ background: #185A4F;
}
.hp-right-content1-title{
margin: 30px auto 25px;
padding-left: 27px;
text-align: left;
- font-family: Arlon;
+ font-family: SourceSansPro;
font-size: min(3vw,40px);
font-style: normal;
font-weight: 600;
@@ -644,9 +634,9 @@ body{
.hp-right-content1-infos-left>div{
width: 120px;
height: 120px;
- border-radius: 50%;
+ border-radius: 50%; */
/* background-color: black; */
- margin-bottom: 10px;
+ /* margin-bottom: 10px;
}
.hp-right-content1-infos-left>div>img{
width: 100%;
@@ -654,8 +644,8 @@ body{
object-fit: cover;
}
.hp-right-content1-infos-left>span{
- color: #000;
- font-family: AlibabaPuHuiTi;
+ color: #62D881;
+ font-family: AccidenCommons;
font-size: 20px;
font-style: normal;
font-weight: 700;
@@ -669,8 +659,8 @@ body{
font-style: normal;
font-weight: 400;
line-height: normal;
- color: black;
- font-family: AlibabaPuHuiTi;
+ color: #62D881;
+ font-family: AccidenzCommons;
}
.hp-right-content1-infos-right{
width: 70%;
@@ -678,8 +668,8 @@ body{
position: relative;
}
.hp-right-content1-infos-right>p{
- color: #000;
- font-family: AlibabaPuHuiTi;
+ color: #62D881;
+ font-family: AccidenzCommons;
font-size: min(1.5vw,20px);
font-style: normal;
font-weight: 400;
@@ -713,12 +703,12 @@ body{
bottom: 0;
right: 0;
cursor: pointer;
-}
+} */
/* details */
-.hp-details-box{
- display: none;
+/* .hp-details-box{
+ display: none; */
/* display: flex; */
- margin-bottom: 0px;
+ /* margin-bottom: 0px;
}
.hp-left-details{
width: 20%;
@@ -745,20 +735,20 @@ body{
line-height: normal;
text-align: justify;
margin-bottom: 40px;
-}
+} */
/* margin */
-.hp-margin-box{
- display: block;
+/* .hp-margin-box{
+ display: block; */
/* 消除inline-blockå½±å“ */
- font-size: 0px;
+ /* font-size: 0px;
height: 80px;
-}
-.hp-left-margin{
+} */
+/* .hp-left-margin{
display: inline-block;
margin-left: 0px;
width: 20%;
-}
-.hp-left-margin-line{
+} */
+/* .hp-left-margin-line{
width: 17px;
height: 80px;
background-color: #B6B2AF;
@@ -776,10 +766,10 @@ body{
font-weight: 600;
}
.hp-right-margin>p{
- transform: translateY(-35%);
-}
+ transform: translateY(-35%); */
+/* } */
/* reflection */
-.ref-button1{
+/* .ref-button1{
background: url("https://static.igem.wiki/teams/4594/wiki/ihp-static/hp-button4.svg");
cursor: pointer;
border-radius: 50%;
@@ -808,8 +798,8 @@ body{
right: 0;
cursor: pointer;
transform: translateY(24%);
-}
-.ref-nobutton{
+} */
+/* .ref-nobutton{
background-color: #F8F0E8;
border-radius: 50%;
width: 50px;
@@ -867,9 +857,9 @@ body{
font-style: normal;
font-weight: 700;
line-height: normal;
-}
+} */
/* bottom button */
-#back-to-top-hp-button{
+/* #back-to-top-hp-button{
text-decoration:none;
color:#F8F0E8;
}
@@ -881,11 +871,11 @@ body{
}
#back-to-top-hp-border:hover{
border-color: #afada9;
-}
+} */
/* for each subpage's background-image */
-.contribution-bg-image{
+/* .contribution-bg-image{
position: fixed;
top: 0;
width: 100%;
@@ -1025,12 +1015,12 @@ body{
-@media screen and (max-width:1400px){
+@media screen and (max-width:1400px){ */
/* left content */
- .hp-left-content-date{
+ /* .hp-left-content-date{
transform: translateX(-25px);
- }
- .hp-left-content-date>span{
+ } */
+ /* .hp-left-content-date>span{
font-size: 15px;
width: 100px;
}
@@ -1042,20 +1032,20 @@ body{
.hp-left-content-line{
width: 14px;
transform: translateX(87px);
- }
+ } */
/* left detail */
- .hp-left-details-line{
+ /* .hp-left-details-line{
width: 14px;
transform: translate(87px, 0px);
- }
+ } */
/* left margin */
- .hp-left-margin-line{
+ /* .hp-left-margin-line{
width: 14px;
transform: translateX(87px);
- }
+ } */
/* left ref */
- .ref-hp-left-content{
+ /* .ref-hp-left-content{
transform: translateX(-40px);
}
.ref-button1{
@@ -1075,14 +1065,14 @@ body{
}
.ref-hp-left-content>span{
font-size: 17px;
- }
+ } */
/* right content */
- .hp-right-content1-infos-left>div{
+ /* .hp-right-content1-infos-left>div{
width: 100px;
height: 100px;
- }
+ } */
/* right font-size */
- .hp-right-content1-title{
+ /* .hp-right-content1-title{
font-size: 35px;
}
.hp-right-content1-infos-left>span{
@@ -1097,47 +1087,47 @@ body{
.hp-right-content1-infos-right>p{
font-size: 18px;
}
-}
+} */
-@media screen and (max-width:1000px){
+/* @media screen and (max-width:1000px){ */
/* left content */
- .hp-left-content{
+ /* .hp-left-content{
display: none;
- }
+ } */
/* left detail */
- .hp-left-details{
+ /* .hp-left-details{
display: none;
- }
+ } */
/* left margin */
- .hp-left-margin{
+ /* .hp-left-margin{
display: none;
- }
+ } */
/* right font-size */
- .hp-right-content1-title{
+ /* .hp-right-content1-title{
font-size: 32px;
- }
- .hp-right-content1-infos-left>span{
+ } */
+ /* .hp-right-content1-infos-left>span{
font-size: 18px;
padding-left: 6px;
- }
- .hp-right-content1-infos-left>p{
+ } */
+ /* .hp-right-content1-infos-left>p{
margin-top: 5px;
padding-left: 6px;
font-size: 12px;
- }
+ } */
/* right center */
- .hp-contents-box{
+ /* .hp-contents-box{
text-align: center;
}
.hp-details-box{
justify-content: center;
- }
+ } */
/* right ref */
- .ref-hp-right-content{
+ /* .ref-hp-right-content{
opacity: 1;
- }
+ } */
/* hidden */
- .hp-right-content1-infos-right>p{
+ /* .hp-right-content1-infos-right>p{
display: none;
}
.hp-right-content1-infos-left{
@@ -1147,12 +1137,12 @@ body{
width: 120px;
height: 120px;
margin: 1px auto 10px;
- }
+ } */
/* margin */
- .hp-margin-box{
+ /* .hp-margin-box{
height: 50px;
}
.hp-right-margin{
width: 100%;
}
-} */
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/wiki/layout.html b/wiki/layout.html
index f9f98e1..47d12be 100644
--- a/wiki/layout.html
+++ b/wiki/layout.html
@@ -13,6 +13,7 @@
<!-- Custom CSS -->
<link href="{{ url_for('static', filename = 'style.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename = 'navbar.css') }}" rel="stylesheet">
+ <link href="{{ url_for('static', filename = 'page.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename = 'footer.css') }}" rel="stylesheet">
<!-- <style>
--
GitLab