From e4900e09f522a4b65dc3f1870d5a821b5a979581 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 09 九月 2024 19:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/CommonHeader.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index aa3672e..4174818 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -2,7 +2,7 @@
<div class="common-header">
<div class="header">
<div class="logo">
- <div>{{ title }}</div>
+ <div class="title">{{ title }}</div>
<div class="list">
<div class="item active">
<div>鏈嶅姟涓績</div>
@@ -208,6 +208,7 @@
background-color: #2080f7;
}
.list{
+ flex: 1;
display: flex;
align-items: center;
margin-left: 60px;
@@ -241,7 +242,7 @@
.logo {
/* background: url("../../assets/images/top_ic_chilun@2x.png") no-repeat; */
box-sizing: border-box;
- min-width: 280px;
+ min-width: 360px;
height: 56px;
padding: 10px 30px;
// flex-shrink: 0;
@@ -251,6 +252,9 @@
color: #fff;
display: flex;
align-items: center;
+ .title{
+ width: 200px;
+ }
// display: inline;
.title-en {
font-size: 11px;
@@ -259,7 +263,7 @@
}
}
.user {
- width: 712px;
+ width: 212px;
box-sizing: border-box;
height: 56px;
padding-right: 25px;
--
Gitblit v1.9.3