From 5cc7ee2ac85f93e9e9df4b268d4fb8bd532bb080 Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期二, 18 七月 2023 11:10:01 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-front-end
---
src/layout/components/Navbar.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index f7aab9a..52e3c41 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,6 +1,6 @@
<template>
<div class="navbar">
- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+ <!-- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
<!-- <breadcrumb class="breadcrumb-container" /> -->
@@ -33,12 +33,12 @@
<script>
import { mapGetters } from 'vuex'
// import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
+// import Hamburger from '@/components/Hamburger'
export default {
components: {
// Breadcrumb,
- Hamburger
+ // Hamburger
},
computed: {
...mapGetters([
@@ -65,6 +65,8 @@
position: relative;
background: #fff;
display: flex;
+ border-bottom: 1px solid #f0f2f5;
+ // box-shadow: 0 0 0.857143rem rgba(0, 0, 0, 0.12);
// box-shadow: 0 1px 4px rgba(0,21,41,.08);
.hamburger-container {
@@ -124,22 +126,25 @@
}
.avatar-container {
- margin-right: 30px;
+ margin-right: 24px;
height: 100%;
.avatar-wrapper {
// margin-top: 5px;
+ width: 40px;
height: 100%;
position: relative;
display: flex;
align-items: center;
+ justify-content: center;
.user-avatar {
cursor: pointer;
- width: 40px;
- height: 40px;
+ width: 30px;
+ height: 30px;
+ font-size: 10px;
border-radius: 50%;
- margin-right: 12px;
+ // margin-right: 12px;
background: #0077DB;
- line-height: 40px;
+ line-height: 31px;
text-align: center;
color: #fff;
}
--
Gitblit v1.9.3