Skip to content

Commit a37db2d

Browse files
committed
fix: Fluid layout Multi-Tab max-width and user menu float right #160
1 parent 2f06701 commit a37db2d

File tree

3 files changed

+48
-37
lines changed

3 files changed

+48
-37
lines changed

src/components/MultiTab/index.less

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@
1717
.topmenu .@{multi-tab-wrapper-prefix-cls} {
1818
max-width: 1200px;
1919
margin: 0 auto;
20-
}
20+
}
21+
22+
.topmenu.content-width-Fluid .@{multi-tab-wrapper-prefix-cls} {
23+
max-width: 100%;
24+
margin: 0 auto;
25+
}

src/components/global.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,10 @@ body {
290290
flex: 1 0 auto;
291291
height: 64px;
292292
overflow: hidden;
293+
294+
.content-box {
295+
float: right;
296+
}
293297
}
294298
}
295299

src/components/tools/UserMenu.vue

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,44 @@
11
<template>
22
<div class="user-wrapper">
3-
<a href="https://pro.loacg.com/docs/getting-started" target="_blank">
4-
<span class="action">
5-
<a-icon type="question-circle-o"></a-icon>
6-
</span>
7-
</a>
8-
<notice-icon class="action"/>
9-
<a-dropdown>
10-
<span class="action ant-dropdown-link user-dropdown-menu">
11-
<a-avatar class="avatar" size="small" :src="avatar()"/>
12-
<span>{{ nickname() }}</span>
13-
</span>
14-
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
15-
<a-menu-item key="0">
16-
<router-link :to="{ name: 'center' }">
17-
<a-icon type="user"/>
18-
<span>个人中心</span>
19-
</router-link>
20-
</a-menu-item>
21-
<a-menu-item key="1">
22-
<router-link :to="{ name: 'settings' }">
3+
<div class="content-box">
4+
<a href="https://pro.loacg.com/docs/getting-started" target="_blank">
5+
<span class="action">
6+
<a-icon type="question-circle-o"></a-icon>
7+
</span>
8+
</a>
9+
<notice-icon class="action"/>
10+
<a-dropdown>
11+
<span class="action ant-dropdown-link user-dropdown-menu">
12+
<a-avatar class="avatar" size="small" :src="avatar()"/>
13+
<span>{{ nickname() }}</span>
14+
</span>
15+
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
16+
<a-menu-item key="0">
17+
<router-link :to="{ name: 'center' }">
18+
<a-icon type="user"/>
19+
<span>个人中心</span>
20+
</router-link>
21+
</a-menu-item>
22+
<a-menu-item key="1">
23+
<router-link :to="{ name: 'settings' }">
24+
<a-icon type="setting"/>
25+
<span>账户设置</span>
26+
</router-link>
27+
</a-menu-item>
28+
<a-menu-item key="2" disabled>
2329
<a-icon type="setting"/>
24-
<span>账户设置</span>
25-
</router-link>
26-
</a-menu-item>
27-
<a-menu-item key="2" disabled>
28-
<a-icon type="setting"/>
29-
<span>测试</span>
30-
</a-menu-item>
31-
<a-menu-divider/>
32-
<a-menu-item key="3">
33-
<a href="javascript:;" @click="handleLogout">
34-
<a-icon type="logout"/>
35-
<span>退出登录</span>
36-
</a>
37-
</a-menu-item>
38-
</a-menu>
39-
</a-dropdown>
30+
<span>测试</span>
31+
</a-menu-item>
32+
<a-menu-divider/>
33+
<a-menu-item key="3">
34+
<a href="javascript:;" @click="handleLogout">
35+
<a-icon type="logout"/>
36+
<span>退出登录</span>
37+
</a>
38+
</a-menu-item>
39+
</a-menu>
40+
</a-dropdown>
41+
</div>
4042
</div>
4143
</template>
4244

0 commit comments

Comments
 (0)