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/Site3/themes/buildYourOwn.json | 280 ++++++++++++++++++++++++++++----------------------------
1 files changed, 140 insertions(+), 140 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/themes/buildYourOwn.json b/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
index bf8a3f0..d5ec09d 100644
--- a/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
+++ b/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
@@ -1,149 +1,149 @@
{
- "activeBrandingSetId": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
- "customCSS": "",
- "developerName": "starter",
- "id": "64870c02-e4cf-4464-8930-7aed413f325b",
- "label": "Build Your Own",
- "layouts": {
- "Inner": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
- "Login": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
- "ServiceNotAvailable": "1664c7f7-6090-4a0d-bfc2-3191064ecd96"
- },
- "type": "theme",
- "views": [
- {
- "componentAttributes": {},
- "componentName": "salesforceIdentity:loginBody2",
- "id": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
- "label": "Login",
- "regions": [
- {
- "id": "c7939c0b-7063-4e10-8c4f-45f5e9a33b91",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "fd5ba3cd-84a7-4c49-bce0-730c85b9ce14",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "fdc32d28-41af-4381-a451-e0574e1e2263",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "type": "view"
+ "activeBrandingSetId": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
+ "customCSS": "",
+ "developerName": "starter",
+ "id": "64870c02-e4cf-4464-8930-7aed413f325b",
+ "label": "Build Your Own",
+ "layouts": {
+ "Inner": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
+ "Login": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
+ "ServiceNotAvailable": "1664c7f7-6090-4a0d-bfc2-3191064ecd96"
},
- {
- "componentAttributes": {
- "fixedPageWidth": 1440,
- "isPageWidthFixed": true
- },
- "componentName": "siteforce:starterBody",
- "id": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
- "label": "Default",
- "regions": [
+ "type": "theme",
+ "views": [
{
- "components": [
- {
- "componentAttributes": {
- "maxAutoCompleteResults": 5,
- "searchLabel": "Search...",
- "searchObjects": [
- {
- "isPublic": true,
- "name": "Account"
- }
- ]
- },
- "componentName": "forceCommunity:globalSearchInput",
- "id": "6b6bd259-0936-4573-8301-b6c3c47991f5",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e1e03672-2dfc-493e-8a59-2cedaf4bdaed",
- "regionName": "search",
- "type": "region"
+ "componentAttributes": {},
+ "componentName": "salesforceIdentity:loginBody2",
+ "id": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
+ "label": "Login",
+ "regions": [
+ {
+ "id": "c7939c0b-7063-4e10-8c4f-45f5e9a33b91",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "id": "fd5ba3cd-84a7-4c49-bce0-730c85b9ce14",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "fdc32d28-41af-4381-a451-e0574e1e2263",
+ "regionName": "footer",
+ "type": "region"
+ }
+ ],
+ "type": "view"
},
{
- "components": [
- {
- "componentAttributes": {
- "accountManagementLabel": "Account Management",
- "communityBuilderLabel": "Experience Builder",
- "communitySetupLabel": "Salesforce Setup",
- "contactSupportLabel": "Contact Support",
- "filterName": "MyCases",
- "homeLabel": "Home",
- "includeContactSupport": true,
- "includeMessages": false,
- "loginLabel": "Login",
- "logoutLabel": "Logout",
- "myAccountLabel": "My Account",
- "showAccountManagement": true,
- "showUserSettings": true,
- "userSettingsLabel": "My Settings",
- "viewProfileLabel": "My Profile"
- },
- "componentName": "selfService:userProfileMenu",
- "id": "886ade64-9894-4fb5-9f0a-91f718f37a7c",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "b93ff3ad-6fb8-46b2-90fd-d85ca8c9b475",
- "regionName": "profileMenu",
- "type": "region"
+ "componentAttributes": {
+ "fixedPageWidth": 1440,
+ "isPageWidthFixed": true
+ },
+ "componentName": "siteforce:starterBody",
+ "id": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
+ "label": "Default",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "maxAutoCompleteResults": 5,
+ "searchLabel": "Search...",
+ "searchObjects": [
+ {
+ "isPublic": true,
+ "name": "Account"
+ }
+ ]
+ },
+ "componentName": "forceCommunity:globalSearchInput",
+ "id": "6b6bd259-0936-4573-8301-b6c3c47991f5",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e1e03672-2dfc-493e-8a59-2cedaf4bdaed",
+ "regionName": "search",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "accountManagementLabel": "Account Management",
+ "communityBuilderLabel": "Experience Builder",
+ "communitySetupLabel": "Salesforce Setup",
+ "contactSupportLabel": "Contact Support",
+ "filterName": "MyCases",
+ "homeLabel": "Home",
+ "includeContactSupport": true,
+ "includeMessages": false,
+ "loginLabel": "Login",
+ "logoutLabel": "Logout",
+ "myAccountLabel": "My Account",
+ "showAccountManagement": true,
+ "showUserSettings": true,
+ "userSettingsLabel": "My Settings",
+ "viewProfileLabel": "My Profile"
+ },
+ "componentName": "selfService:userProfileMenu",
+ "id": "886ade64-9894-4fb5-9f0a-91f718f37a7c",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "b93ff3ad-6fb8-46b2-90fd-d85ca8c9b475",
+ "regionName": "profileMenu",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "NavigationMenuEditorRefresh": "",
+ "hideAppLauncher": true,
+ "hideHomeText": true
+ },
+ "componentName": "forceCommunity:globalNavigation",
+ "id": "74de3519-3e37-45f7-a9b0-686b6d576293",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "32f4c679-a1ec-4d0f-8227-f766aff2348b",
+ "regionName": "navBar",
+ "type": "region"
+ }
+ ],
+ "type": "view"
},
{
- "components": [
- {
- "componentAttributes": {
- "NavigationMenuEditorRefresh": "",
- "hideAppLauncher": true,
- "hideHomeText": true
- },
- "componentName": "forceCommunity:globalNavigation",
- "id": "74de3519-3e37-45f7-a9b0-686b6d576293",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "32f4c679-a1ec-4d0f-8227-f766aff2348b",
- "regionName": "navBar",
- "type": "region"
+ "componentAttributes": {
+ "fixedPageWidth": 1170,
+ "headerBgColor": "rgba(0, 0, 0, 0)",
+ "isHeaderPinned": false,
+ "isHeroUnderHeader": false,
+ "isPageWidthFixed": true,
+ "showHeader": true,
+ "showHero": true
+ },
+ "componentName": "siteforce:themeLayoutStarter",
+ "id": "1664c7f7-6090-4a0d-bfc2-3191064ecd96",
+ "label": "ServiceNotAvailable",
+ "regions": [
+ {
+ "id": "2bf842b8-e94c-4694-bf82-3f82bfb626fc",
+ "regionName": "themeHeader",
+ "type": "region"
+ },
+ {
+ "id": "e598c1cc-513c-4cff-9029-ace967593639",
+ "regionName": "themeFooter",
+ "type": "region"
+ }
+ ],
+ "type": "view"
}
- ],
- "type": "view"
- },
- {
- "componentAttributes": {
- "fixedPageWidth": 1170,
- "headerBgColor": "rgba(0, 0, 0, 0)",
- "isHeaderPinned": false,
- "isHeroUnderHeader": false,
- "isPageWidthFixed": true,
- "showHeader": true,
- "showHero": true
- },
- "componentName": "siteforce:themeLayoutStarter",
- "id": "1664c7f7-6090-4a0d-bfc2-3191064ecd96",
- "label": "ServiceNotAvailable",
- "regions": [
- {
- "id": "2bf842b8-e94c-4694-bf82-3f82bfb626fc",
- "regionName": "themeHeader",
- "type": "region"
- },
- {
- "id": "e598c1cc-513c-4cff-9029-ace967593639",
- "regionName": "themeFooter",
- "type": "region"
- }
- ],
- "type": "view"
- }
- ]
+ ]
}
--
Gitblit v1.9.1