提交 fee4f9a6 authored 作者: junjie's avatar junjie

feat(frontend):UI fix

上级 a5ebc48b
<template> <template>
<div class="top-nav" :style="{'background-color': theme}"> <div class="top-nav" :style="{'background-color': '#f1f3f8'}">
<div class="log"> <div class="log">
<img v-if="!logoUrl" src="@/assets/DataEase-white.png" width="160" alt="" style="padding-top: 8px;"> <img v-if="!logoUrl" src="@/assets/DataEase-color.png" width="160" alt="" style="padding-top: 8px;">
<img v-else :src="logoUrl" width="160" alt="" style="padding-top: 8px;"> <img v-else :src="logoUrl" width="160" alt="" style="padding-top: 8px;">
</div> </div>
<el-menu <el-menu
:active-text-color="variables.topMenuActiveText" :active-text-color="variables.topMenuActiveText"
:default-active="activeMenu" :default-active="activeMenu"
mode="horizontal" mode="horizontal"
:style="{'background-color': theme}" :style="{'background-color': '#f1f3f8'}"
@select="handleSelect" @select="handleSelect"
> >
<div v-for="item in permission_routes" :key="item.path" class="nav-item"> <div v-for="item in permission_routes" :key="item.path" class="nav-item">
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.el-dropdown-link { .el-dropdown-link {
cursor: pointer; cursor: pointer;
color: #ffffff; color: #1e212a;
} }
.el-icon-arrow-down { .el-icon-arrow-down {
font-size: 12px; font-size: 12px;
...@@ -240,7 +240,7 @@ export default { ...@@ -240,7 +240,7 @@ export default {
padding: 10px 8px; padding: 10px 8px;
height: 100%; height: 100%;
font-size: 16px; font-size: 16px;
color: rgba(255,255,255,.87); color: #1e212a;
vertical-align: text-bottom; vertical-align: text-bottom;
margin-right: 10px; margin-right: 10px;
} }
......
...@@ -191,7 +191,7 @@ div:focus { ...@@ -191,7 +191,7 @@ div:focus {
.ds-icon-scene{ .ds-icon-scene{
width: 14px; width: 14px;
height: 14px; height: 14px;
color: #faaa39; color: #0a7be0;
} }
.ds-icon-db{ .ds-icon-db{
width: 14px; width: 14px;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
left: 0; left: 0;
z-index: 1001; z-index: 1001;
overflow: hidden; overflow: hidden;
border-bottom: 1px solid #DCDFE6;
.log { .log {
padding: 0 16px; padding: 0 16px;
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
display: inline-block; display: inline-block;
.el-menu-item { .el-menu-item {
// color: rgb(191, 203, 217); // color: rgb(191, 203, 217);
color: rgba(255,255,255,0.87); color: $menuText;
&:hover { &:hover {
background-color: $subMenuHover !important; background-color: $subMenuHover !important;
color: $subMenuActiveText !important; color: $subMenuActiveText !important;
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
height: 100%; height: 100%;
font-size: 18px; font-size: 18px;
// color: #5a5e66; // color: #5a5e66;
color: $menuText; color: #606266;
vertical-align: text-bottom; vertical-align: text-bottom;
&.hover-effect { &.hover-effect {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
**/ **/
/* theme color */ /* theme color */
$--color-primary: #f1a826; $--color-primary: #0a7be0;
$--color-success: #13ce66; $--color-success: #13ce66;
$--color-warning: #ffba00; $--color-warning: #ffba00;
$--color-danger: #ff4949; $--color-danger: #ff4949;
...@@ -26,8 +26,8 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts"; ...@@ -26,8 +26,8 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
@import "~fit2cloud-ui/src/styles/common/variables"; @import "~fit2cloud-ui/src/styles/common/variables";
// sidebar // sidebar
$menuText:rgba(255,255,255,0.87); $menuText:#1e212a;
$menuActiveText:#f18126; $menuActiveText:#0a7be0;
$topMenuActiveText:#f4f4f5; $topMenuActiveText:#f4f4f5;
$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
...@@ -38,7 +38,7 @@ $menuHover: rgba(158, 158, 158, 0.2); ...@@ -38,7 +38,7 @@ $menuHover: rgba(158, 158, 158, 0.2);
$subMenuBg:#1f2d3d; $subMenuBg:#1f2d3d;
// $subMenuHover:#001528; // $subMenuHover:#001528;
$subMenuHover:#f18126; $subMenuHover:#0a7be0;
$sideBarWidth: 210px; $sideBarWidth: 210px;
$topBarHeight: 56px; $topBarHeight: 56px;
......
...@@ -817,9 +817,9 @@ export default { ...@@ -817,9 +817,9 @@ export default {
} }
.item:hover { .item:hover {
color: #f1a826; color: #1890ff;
background: #fffcef; background: #e8f4ff;
border-color: #f3c13c; border-color: #a3d3ff;
cursor: pointer; cursor: pointer;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论