monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 1ceb643310bdd0e8b21f6346139943c8d356981e 2 parents 9ec07832 9fbf806a

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

【无】公司网站-样式修改 #5



See merge request !1043
Inline Side-by-side
Showing 4 changed files with 22 additions and 13 deletions
... ... @@ -2114,15 +2114,29 @@ blockquote:before {
display: flex;
align-items: center;
padding-bottom: 30px;
width: 100%;
}
.dot-item{
padding:20px;
padding:10px;
cursor: pointer;
display: flex;
align-items: center;
}
.dot-item-active,.dot-item:hover{
background-color:#e43730;
.dot-item-title{
font-size: 18px;
font-weight: bold;
flex:1;
background-color: #f3f5f8;
border-radius: 5px;
padding:20px;
height: 100%;
display: flex;
align-items: center;
}
.dot-item-active .dot-item-title,.dot-item:hover .dot-item-title{
background-color:#e43730;
color:#ffffff;
}
@media (min-width: 992px){
... ... @@ -2240,11 +2254,6 @@ blockquote:before {
.footer-widget h4{
color:#fff;
}
.dot-item-title{
font-size: 14px;
font-weight: bold;
}
.cursor-pointer{
cursor: pointer;
}
... ...

99.9 KB | W: | H:

90.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -67,7 +67,7 @@
<div class="dot-container row">
<div @click="changeCharacter(indexC)" :class="['dot-item', 'col-lg-4', {'dot-item-active':indexC==characterActive,'div-hide':!itemC.isDisplay}]" v-for="(itemC,indexC) in item.dataFour">
<div class="dot-item-title" v-if="itemC.isDisplay">{{itemC.title}}</div>
<div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div>
<!-- <div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div>-->
</div>
</div>
<i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i>
... ...
... ... @@ -53,14 +53,14 @@
</div>
</div>
<div class="row-bottom row pt-30">
<i class="iconCharacter icon-left" @click="prev(item.dataFour.length)"></i>
<!-- <i class="iconCharacter icon-left" @click="prev(item.dataFour.length)"></i>-->
<div class="dot-container row">
<div @click="changeCharacter(indexC)" :class="['dot-item', 'col-lg-4', {'dot-item-active':indexC==characterActive,'div-hide':!itemC.isDisplay}]" v-for="(itemC,indexC) in item.dataFour">
<div @click="changeCharacter(indexC)" :class="['dot-item', 'col-lg-3', {'dot-item-active':indexC==characterActive,'div-hide':!itemC.isDisplay}]" v-for="(itemC,indexC) in item.dataFour">
<div class="dot-item-title" v-if="itemC.isDisplay">{{itemC.title}}</div>
<div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div>
<!-- <div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div>-->
</div>
</div>
<i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i>
<!-- <i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i>-->
</div>
</div>
<div class="row pt-30" v-if="item.dataFive && item.dataFive.length>0">
... ...