Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【无】公司网站-样式修改 #5 See merge request !1043
Showing
4 changed files
with
22 additions
and
13 deletions
@@ -2114,15 +2114,29 @@ blockquote:before { | @@ -2114,15 +2114,29 @@ blockquote:before { | ||
2114 | display: flex; | 2114 | display: flex; |
2115 | align-items: center; | 2115 | align-items: center; |
2116 | padding-bottom: 30px; | 2116 | padding-bottom: 30px; |
2117 | + width: 100%; | ||
2117 | } | 2118 | } |
2118 | 2119 | ||
2119 | .dot-item{ | 2120 | .dot-item{ |
2120 | - padding:20px; | 2121 | + padding:10px; |
2121 | cursor: pointer; | 2122 | cursor: pointer; |
2123 | + display: flex; | ||
2124 | + align-items: center; | ||
2122 | } | 2125 | } |
2123 | -.dot-item-active,.dot-item:hover{ | ||
2124 | - background-color:#e43730; | 2126 | +.dot-item-title{ |
2127 | + font-size: 18px; | ||
2128 | + font-weight: bold; | ||
2129 | + flex:1; | ||
2130 | + background-color: #f3f5f8; | ||
2125 | border-radius: 5px; | 2131 | border-radius: 5px; |
2132 | + padding:20px; | ||
2133 | + height: 100%; | ||
2134 | + display: flex; | ||
2135 | + align-items: center; | ||
2136 | +} | ||
2137 | + | ||
2138 | +.dot-item-active .dot-item-title,.dot-item:hover .dot-item-title{ | ||
2139 | + background-color:#e43730; | ||
2126 | color:#ffffff; | 2140 | color:#ffffff; |
2127 | } | 2141 | } |
2128 | @media (min-width: 992px){ | 2142 | @media (min-width: 992px){ |
@@ -2240,11 +2254,6 @@ blockquote:before { | @@ -2240,11 +2254,6 @@ blockquote:before { | ||
2240 | .footer-widget h4{ | 2254 | .footer-widget h4{ |
2241 | color:#fff; | 2255 | color:#fff; |
2242 | } | 2256 | } |
2243 | -.dot-item-title{ | ||
2244 | - font-size: 14px; | ||
2245 | - | ||
2246 | - font-weight: bold; | ||
2247 | -} | ||
2248 | .cursor-pointer{ | 2257 | .cursor-pointer{ |
2249 | cursor: pointer; | 2258 | cursor: pointer; |
2250 | } | 2259 | } |
@@ -67,7 +67,7 @@ | @@ -67,7 +67,7 @@ | ||
67 | <div class="dot-container row"> | 67 | <div class="dot-container row"> |
68 | <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"> | 68 | <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"> |
69 | <div class="dot-item-title" v-if="itemC.isDisplay">{{itemC.title}}</div> | 69 | <div class="dot-item-title" v-if="itemC.isDisplay">{{itemC.title}}</div> |
70 | - <div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div> | 70 | +<!-- <div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div>--> |
71 | </div> | 71 | </div> |
72 | </div> | 72 | </div> |
73 | <i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i> | 73 | <i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i> |
@@ -53,14 +53,14 @@ | @@ -53,14 +53,14 @@ | ||
53 | </div> | 53 | </div> |
54 | </div> | 54 | </div> |
55 | <div class="row-bottom row pt-30"> | 55 | <div class="row-bottom row pt-30"> |
56 | - <i class="iconCharacter icon-left" @click="prev(item.dataFour.length)"></i> | 56 | +<!-- <i class="iconCharacter icon-left" @click="prev(item.dataFour.length)"></i>--> |
57 | <div class="dot-container row"> | 57 | <div class="dot-container row"> |
58 | - <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"> | 58 | + <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"> |
59 | <div class="dot-item-title" v-if="itemC.isDisplay">{{itemC.title}}</div> | 59 | <div class="dot-item-title" v-if="itemC.isDisplay">{{itemC.title}}</div> |
60 | - <div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div> | 60 | +<!-- <div class="dot-item-intro" v-if="itemC.isDisplay">{{itemC.introduction}}</div>--> |
61 | </div> | 61 | </div> |
62 | </div> | 62 | </div> |
63 | - <i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i> | 63 | +<!-- <i class="iconCharacter icon-right" @click="next(item.dataFour.length)"></i>--> |
64 | </div> | 64 | </div> |
65 | </div> | 65 | </div> |
66 | <div class="row pt-30" v-if="item.dataFive && item.dataFive.length>0"> | 66 | <div class="row pt-30" v-if="item.dataFive && item.dataFive.length>0"> |
-
Please register or login to post a comment