From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/components/serviceNavBar/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index c2ae03a..b2d64cc 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -238,16 +238,16 @@
width: 100%;
height: 36px;
line-height: 36px;
- background: rgba(0, 131, 176, 0.9); /* fallback for old browsers */
+ background: rgba(0, 131, 176, 0.7); /* fallback for old browsers */
background: -webkit-linear-gradient(
to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
+ rgba(0, 180, 219, 0.7),
+ rgba(0, 131, 176, 0.7)
); /* Chrome 10-25, Safari 5.1-6 */
background: linear-gradient(
to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
+ rgba(0, 180, 219, 0.7),
+ rgba(0, 131, 176, 0.7)
); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
.title {
@@ -286,16 +286,16 @@
margin-top: 0px;
text-align: center;
overflow-y: auto;
- background: rgba(0, 131, 176, 0.9); /* fallback for old browsers */
+ background: rgba(0, 131, 176, 0.7); /* fallback for old browsers */
background: -webkit-linear-gradient(
to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
+ rgba(0, 180, 219, 0.7),
+ rgba(0, 131, 176, 0.7)
); /* Chrome 10-25, Safari 5.1-6 */
background: linear-gradient(
to left,
- rgba(0, 180, 219, 0.9),
- rgba(0, 131, 176, 0.9)
+ rgba(0, 180, 219, 0.7),
+ rgba(0, 131, 176, 0.7)
); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
border-radius: 0 0 8px 8px;
--
Gitblit v1.9.3