From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json b/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json
index 69318b0..6d04fc3 100644
--- a/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json
+++ b/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json
@@ -1,56 +1,56 @@
{
- "definitionName": "prm:branding-prm-merged",
- "id": "2bafe70c-3369-45be-8bc4-ae2816db3a7c",
- "label": "Partner Central",
- "type": "brandingSet",
- "values": {
- "ActionColor": "#0E63AC",
- "BorderColor": "#D4D4D4",
- "CardBackgroundColor": "rgba(255, 255, 255, 0)",
- "CompanyLogo": "",
- "DetailTextColor": "#5A5A5A",
- "ErrorFontColor": "#ff9e9e",
- "HeaderBackgroundColor": "#FFFFFF",
- "HeaderFonts": "Open Sans",
- "LinkColor": "#3558D6",
- "LoginBackgroundColor": "#F4F4F4",
- "LoginBackgroundImage": "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
- "NavigationMenuColor": "#1E2443",
- "NavigationMenuTextColor": "#FFFFFF",
- "OverlayTextColor": "#FFFFFF",
- "PageBackgroundColor": "#FFFFFF",
- "PrimaryFont": "Work Sans",
- "TextColor": "#222222",
- "TextTransformStyle": "none",
- "_ActionColorDarker": "#135F90",
- "_ActionColorTrans": "rgba(25, 124, 190, 0.9)",
- "_BackgroundColor1": "rgb(235, 235, 235)",
- "_BackgroundColor2": "rgb(194, 194, 194)",
- "_BackgroundColor3": "rgb(133, 133, 133)",
- "_DxpPageBackgroundColor": "#FFFFFF",
- "_HeaderInputBackgroundColor": "rgba(255,255,255,.4)",
- "_HeaderPlaceholderTextColor": "rgba(85,85,85,.8)",
- "_HeaderTextColor": "rgba(34,34,34,.8)",
- "_HoverColor": "rgba(25, 124, 190, 0.05)",
- "_LinkColorDarker": "#135F90",
- "_NavigationMenuHoverColor": "rgba(255,255,255,.2)",
- "_NeutralColor": "#ecebea",
- "_NeutralColor1": "rgb(217, 215, 213)",
- "_NeutralColor2": "rgb(178, 174, 170)",
- "_NeutralColor3": "rgb(118, 113, 107)",
- "_NeutralForegroundColor": "#000",
- "_NeutralForegroundColor1": "#000",
- "_NeutralForegroundColor2": "#000",
- "_NeutralForegroundColor3": "#fff",
- "_OverlayTextColorShadow": "#000000",
- "_PrimaryAccentColor1": "rgb(11, 77, 134)",
- "_PrimaryAccentColor2": "rgb(5, 34, 59)",
- "_PrimaryAccentColor3": "rgb(0, 0, 0)",
- "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
- "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
- "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
- "_TextColor1": "rgb(14, 14, 14)",
- "_TextColor2": "rgb(0, 0, 0)",
- "_TextColor3": "rgb(0, 0, 0)"
- }
+ "definitionName": "prm:branding-prm-merged",
+ "id": "2bafe70c-3369-45be-8bc4-ae2816db3a7c",
+ "label": "Partner Central",
+ "type": "brandingSet",
+ "values": {
+ "ActionColor": "#0E63AC",
+ "BorderColor": "#D4D4D4",
+ "CardBackgroundColor": "rgba(255, 255, 255, 0)",
+ "CompanyLogo": "",
+ "DetailTextColor": "#5A5A5A",
+ "ErrorFontColor": "#ff9e9e",
+ "HeaderBackgroundColor": "#FFFFFF",
+ "HeaderFonts": "Open Sans",
+ "LinkColor": "#3558D6",
+ "LoginBackgroundColor": "#F4F4F4",
+ "LoginBackgroundImage": "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
+ "NavigationMenuColor": "#1E2443",
+ "NavigationMenuTextColor": "#FFFFFF",
+ "OverlayTextColor": "#FFFFFF",
+ "PageBackgroundColor": "#FFFFFF",
+ "PrimaryFont": "Work Sans",
+ "TextColor": "#222222",
+ "TextTransformStyle": "none",
+ "_ActionColorDarker": "#135F90",
+ "_ActionColorTrans": "rgba(25, 124, 190, 0.9)",
+ "_BackgroundColor1": "rgb(235, 235, 235)",
+ "_BackgroundColor2": "rgb(194, 194, 194)",
+ "_BackgroundColor3": "rgb(133, 133, 133)",
+ "_DxpPageBackgroundColor": "#FFFFFF",
+ "_HeaderInputBackgroundColor": "rgba(255,255,255,.4)",
+ "_HeaderPlaceholderTextColor": "rgba(85,85,85,.8)",
+ "_HeaderTextColor": "rgba(34,34,34,.8)",
+ "_HoverColor": "rgba(25, 124, 190, 0.05)",
+ "_LinkColorDarker": "#135F90",
+ "_NavigationMenuHoverColor": "rgba(255,255,255,.2)",
+ "_NeutralColor": "#ecebea",
+ "_NeutralColor1": "rgb(217, 215, 213)",
+ "_NeutralColor2": "rgb(178, 174, 170)",
+ "_NeutralColor3": "rgb(118, 113, 107)",
+ "_NeutralForegroundColor": "#000",
+ "_NeutralForegroundColor1": "#000",
+ "_NeutralForegroundColor2": "#000",
+ "_NeutralForegroundColor3": "#fff",
+ "_OverlayTextColorShadow": "#000000",
+ "_PrimaryAccentColor1": "rgb(11, 77, 134)",
+ "_PrimaryAccentColor2": "rgb(5, 34, 59)",
+ "_PrimaryAccentColor3": "rgb(0, 0, 0)",
+ "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
+ "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
+ "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
+ "_TextColor1": "rgb(14, 14, 14)",
+ "_TextColor2": "rgb(0, 0, 0)",
+ "_TextColor3": "rgb(0, 0, 0)"
+ }
}
--
Gitblit v1.9.1