t510599/2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev2' into master

Browse Source
This commit is contained in:
mysper 2021-01-19 18:12:45 +08:00
commit 6366c08a4d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -32,4 +32,4 @@
"typescript": "~3.9.3", "typescript": "~3.9.3",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"
} }
} }

10
src/assets/scss/CFP/cfp_introduction.scss
View File

@ -92,6 +92,8 @@ $buttonHoverBg: #226BB4;
letter-spacing: $contextLetterSpace; letter-spacing: $contextLetterSpace;
line-height: 42px; line-height: 42px;
width: 1100px;
@media screen and(max-width: 414px) { @media screen and(max-width: 414px) {
margin-top: 60%; margin-top: 60%;
width: 110%; width: 110%;
@ -359,7 +361,7 @@ p.small-tag {
.thumbnails { .thumbnails {
// box // box
margin-left: -25.5px; margin-left: -20.5px;
@media screen and (max-width:414px){ @media screen and (max-width:414px){
margin-left: -9px; margin-left: -9px;
@ -370,6 +372,8 @@ p.small-tag {
// box // box
border-style: none; border-style: none;
border-spacing: 25.5px 0px; //25.5 border-spacing: 25.5px 0px; //25.5
text-align: center;
width: 640px;
@media screen and (max-width: 414px) { @media screen and (max-width: 414px) {
width: 87%; width: 87%;
@ -399,7 +403,7 @@ p.small-tag {
box-shadow: 0 3px 12px 0 rgba(89, 120, 206, 0.56); box-shadow: 0 3px 12px 0 rgba(89, 120, 206, 0.56);
border-radius: 60px; border-radius: 60px;
transform: rotate(15deg); transform: rotate(15deg);
margin-bottom: -900px; margin-bottom: -800px;
margin-left: -200px; margin-left: -200px;
margin-top: -300px; margin-top: -300px;
z-index: 1; z-index: 1;
@ -672,7 +676,7 @@ p.small-tag {
position: absolute; position: absolute;
width: 100%; width: 100%;
margin-top: -18.5%; margin-top: -18.5%;
margin-left: -14%; margin-left: -13%;
transform: scale(0.2); transform: scale(0.2);
@media screen and(max-width: 414px){ @media screen and(max-width: 414px){