yangjun
/
nursing_unit_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改冲突文件

This commit is contained in:
yangjun 2025-08-15 16:37:08 +08:00
parent 0c31c8a181
commit 3fea115834
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/layouts/default/header/index.vue
View File

@ -263,18 +263,10 @@
} }
.headClass{ .headClass{
<<<<<<< .mine
// background-image: url('../resource/img/bj.png') !important; // background-image: url('../resource/img/bj.png') !important;
// background-repeat: no-repeat; // background-repeat: no-repeat;
// background-size: 100% auto; // background-size: 100% auto;
// background-color: #eef3f8 !important; // background-color: #eef3f8 !important;
background: linear-gradient(to right, #e2edff, #eef3f8) !important; background: linear-gradient(to right, #e2edff, #eef3f8) !important;
=======
// background-image: url('../resource/img/bj.png') !important;
// background-repeat: no-repeat;
// background-size: 100% auto;
// background-color: #e5f5f9 !important;
>>>>>>> .theirs
} }
</style> </style>