Skip to content

Commit ac34872

Browse files
author
ParnDeedlit&潘卓然
committed
【站点】【修复】【修复Antd&Element混用导致的显示异常】
1 parent 1dc0788 commit ac34872

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

website/src/views/layout/components/Header/Header.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<IconFont :type="h.icon" class="menu-icon" />
2323
{{ h.title }}
2424
</el-button>
25-
</el-popover>
25+
</el-popover>
2626
</template>
2727
</div>
2828
</div>

website/src/views/layout/components/Header/Menu.vue

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,32 @@ export default {
9494
<style lang="scss">
9595
@media (max-width:640px){
9696
.header-menu-wrapper {
97-
padding: 0 0vw !important;
97+
padding: 0 0vw;
98+
}
99+
}
100+
@media (min-width:720px){
101+
.header-menu-wrapper {
102+
padding: 0 5vw;
98103
}
99104
}
100105
@media (min-width:960px){
101106
.header-menu-wrapper {
102-
padding: 0 0vw !important;
107+
padding: 0 15vw;
108+
}
109+
}
110+
111+
@media (min-width:1280px){
112+
.header-menu-wrapper {
113+
padding: 0 20vw;
103114
}
104115
}
116+
105117
.header-menu-wrapper {
106118
display: flex;
107119
flex-wrap: wrap;
108120
// width: fit-content;
109-
width: calc(100vw - 51px);
110-
padding: 0 10vw;
121+
width: 100vw;
111122
height: 600px;
112-
max-width: 100vw;
113123
overflow: auto;
114124
background: #1c1c1c;
115125
box-shadow: 0px 1px 9px 0px rgba(0, 0, 12, 0.1);
@@ -189,6 +199,7 @@ export default {
189199
.el-popover {
190200
border: 1px solid #062f52 !important;
191201
background: #1c1c1c !important;
202+
width: 100vw !important;
192203
}
193204
194205
.popper__arrow {

0 commit comments

Comments
 (0)