Merge branch 'fix-intro' into dev2

This commit is contained in:
hyperbola 2021-01-20 09:00:47 +08:00
commit 447b0ed81d
No known key found for this signature in database
GPG Key ID: D987B1D59478B51F

View File

@ -1,12 +1,12 @@
@import '../hyperpoint'; @import '../hyperpoint';
@import '../color';
$fontFamily: Noto Sans TC; $fontFamily: Noto Sans TC;
$fontColor: #226BB4; $fontColor: $mid-blue;
// General settings: // General settings:
// font-size and paragraph spacing for headers and paragraph text // font-size and paragraph spacing for headers and paragraph text
#cfp-intro { #cfp-intro {
margin-top: 90px; margin-top: 90px;
padding: 96px 0 0 0;
h1, h1,
h2, h2,
@ -16,9 +16,6 @@ $fontColor: #226BB4;
p { p {
line-height: 1.75; line-height: 1.75;
}
p:not(:last-child) {
margin-bottom: 2em; margin-bottom: 2em;
} }
@ -41,10 +38,11 @@ $fontColor: #226BB4;
} }
} }
.introduction { .introduction {
height: 2250px; height: 2400px;
overflow: hidden; overflow: hidden;
padding-bottom: 0; padding-bottom: 0;
} }
// Utiliy // Utiliy
#cfp-intro { #cfp-intro {
.mr-2 { .mr-2 {
@ -59,8 +57,8 @@ $fontColor: #226BB4;
} }
#cfp-intro { #cfp-intro {
.box-back { .box-back {
// margin-top: -120px;
// width: 880px; // width: 880px;
margin-bottom: -40em; margin-bottom: -40em;
font-family: $fontFamily; font-family: $fontFamily;
@ -71,7 +69,7 @@ $fontColor: #226BB4;
.first-box { .first-box {
transform: rotate(15deg); transform: rotate(15deg);
box-shadow: 0 3px 12px 0 rgba(89,120,206,.56); box-shadow: 0 3px 12px 0 rgba(89, 120, 206, 0.56);
border-radius: 30px; border-radius: 30px;
position: relative; position: relative;
bottom: 550px; bottom: 550px;
@ -139,8 +137,8 @@ $fontColor: #226BB4;
color: $fontColor; color: $fontColor;
width: 900px; width: 900px;
padding: 20px; padding: 20px 20px 168px 20px;
height: 2200px; height: 2350px;
.about-topic { .about-topic {
margin-bottom: 2em; margin-bottom: 2em;
@ -152,7 +150,7 @@ $fontColor: #226BB4;
.second-box { .second-box {
transform: rotate(15deg); transform: rotate(15deg);
box-shadow: 0 3px 12px 0 rgba(89,120,206,.56); box-shadow: 0 3px 12px 0 rgba(89, 120, 206, 0.56);
border-radius: 30px; border-radius: 30px;
position: relative; position: relative;
bottom: 1100px; bottom: 1100px;