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

[fix] fix html tag problem

Browse Source
This commit is contained in:
mysper 2021-01-20 20:08:36 +08:00
parent 80c42d9e9f
commit 82e1fc3aca
2 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/assets/scss/CFP/intro.scss
View File

@ -686,65 +686,6 @@
}
}
<<<<<<< HEAD
@media screen and (max-width: 800px) {
.cfp-deadline-content {
display: flex;
flex-direction: row;
flex-wrap: wrap;
width: 600px;
height: 120px;
}
#cfp-intro{
.box-back2 {
// width: 760px;
font-family: $fontFamily;
color: $fontColor;
width: 900px;
padding: 20px 20px 168px 20px;
height: 2350px;
.about-topic {
margin-bottom: 2em;
position: relative;
bottom: 35px;
z-index: 2;
left: 50px;
}
.second-box {
transform: rotate(15deg);
box-shadow: 0 3px 12px 0 rgba(89, 120, 206, 0.56);
border-radius: 30px;
position: relative;
bottom: 1100px;
right: 120px;
z-index: 0;
}
.cfp-deadline {
margin-bottom: 2em;
margin-bottom: 2em;
position: relative;
z-index: 2;
left: 50px;
bottom: 55px;
.cfp-deadline-content {
margin-top: -1.5em;
display: flex;
flex-direction: row;
align-items: flex-end;
.cfp-introd-btn-outter {
transform: scale(.85);
position: relative;
right: 25px;
}
}
}
=======
>>>>>>> dev2
.give-me-money {
top: 2em;
.whisper {

14
src/components/CFP/Intro.vue
View File

@ -110,21 +110,7 @@
<span class="h3">01/15 ～ 02/22</span
><span class="ml-2">詳細時程請見</span>
</p>
<<<<<<< HEAD
</div>
<div class="cfp-deadline">
<h3>徵稿時間</h3>
<div class="cfp-deadline-content">
<div>
<span class="h3">01/20 ～ 02/22</span>
<span class="ml-2 mr-2">詳細時程請見</span>
</div>
<div class="cfp-introd-btn-outter">
<a class="btn btn-primary mr-2" rel="noopener" href="/2021/cfp/news">投稿資訊</a>
=======
<p class="mobile-only">
>>>>>>> dev2
<a
class="btn btn-primary mr-2"
rel="noopener"