fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json

@@ -1,54 +1,54 @@
{
  "definitionName" : "starter:branding-starter",
  "id" : "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
  "label" : "Build Your Own",
  "type" : "brandingSet",
  "values" : {
    "ActionColor" : "#2574A9",
    "BorderColor" : "#D4D4D4",
    "CardBackgroundColor" : "rgba(255, 255, 255, 0)",
    "CompanyLogo" : "",
    "DetailTextColor" : "#696969",
    "ErrorFontColor" : "#ff9e9e",
    "HeaderFonts" : "Montserrat",
    "LinkColor" : "#2574A9",
    "LoginBackgroundColor" : "#F4F4F4",
    "LoginBackgroundImage" : "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
    "OverlayTextColor" : "#FFFFFF",
    "PrimaryFont" : "Lato",
    "TextColor" : "#333",
    "TextTransformStyle" : "uppercase",
    "_ActionColorDarker" : "#1c577f",
    "_ActionColorTrans" : "rgba(37, 116, 169, 0.9)",
    "_BackgroundColor1" : "rgb(235, 235, 235)",
    "_BackgroundColor2" : "rgb(194, 194, 194)",
    "_BackgroundColor3" : "rgb(133, 133, 133)",
    "_DxpPageBackgroundColor" : "#FFFFFF",
    "_HoverColor" : "rgba(37, 116, 169, 0.05)",
    "_LinkColorDarker" : "#135F90",
    "_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" : "#000",
    "_PrimaryAccentColor1" : "rgb(30, 93, 136)",
    "_PrimaryAccentColor2" : "rgb(15, 47, 69)",
    "_PrimaryAccentColor3" : "rgb(0, 0, 0)",
    "_PrimaryAccentForegroundColor1" : "rgb(255, 255, 255)",
    "_PrimaryAccentForegroundColor2" : "rgb(255, 255, 255)",
    "_PrimaryAccentForegroundColor3" : "rgb(255, 255, 255)",
    "_TextColor1" : "rgb(31, 31, 31)",
    "_TextColor2" : "rgb(0, 0, 0)",
    "_TextColor3" : "rgb(0, 0, 0)",
    "_brandNavigationBarBackgroundColor" : "rgba(128,128,128,.75)",
    "_brandNavigationItemBackgroundColorHover" : "rgba(0,0,0,.2)",
    "_brandNavigationItemDividerColor" : "rgba(255, 255, 255, 0.2)",
    "brandNavigationBackgroundColor" : "rgb(128,128,128)",
    "brandNavigationBarBackgroundColor" : "rgba(128,128,128,.75)",
    "brandNavigationColorText" : "#FFFFFF"
  }
}
    "definitionName": "starter:branding-starter",
    "id": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
    "label": "Build Your Own",
    "type": "brandingSet",
    "values": {
        "ActionColor": "#2574A9",
        "BorderColor": "#D4D4D4",
        "CardBackgroundColor": "rgba(255, 255, 255, 0)",
        "CompanyLogo": "",
        "DetailTextColor": "#696969",
        "ErrorFontColor": "#ff9e9e",
        "HeaderFonts": "Montserrat",
        "LinkColor": "#2574A9",
        "LoginBackgroundColor": "#F4F4F4",
        "LoginBackgroundImage": "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
        "OverlayTextColor": "#FFFFFF",
        "PrimaryFont": "Lato",
        "TextColor": "#333",
        "TextTransformStyle": "uppercase",
        "_ActionColorDarker": "#1c577f",
        "_ActionColorTrans": "rgba(37, 116, 169, 0.9)",
        "_BackgroundColor1": "rgb(235, 235, 235)",
        "_BackgroundColor2": "rgb(194, 194, 194)",
        "_BackgroundColor3": "rgb(133, 133, 133)",
        "_DxpPageBackgroundColor": "#FFFFFF",
        "_HoverColor": "rgba(37, 116, 169, 0.05)",
        "_LinkColorDarker": "#135F90",
        "_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": "#000",
        "_PrimaryAccentColor1": "rgb(30, 93, 136)",
        "_PrimaryAccentColor2": "rgb(15, 47, 69)",
        "_PrimaryAccentColor3": "rgb(0, 0, 0)",
        "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
        "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
        "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
        "_TextColor1": "rgb(31, 31, 31)",
        "_TextColor2": "rgb(0, 0, 0)",
        "_TextColor3": "rgb(0, 0, 0)",
        "_brandNavigationBarBackgroundColor": "rgba(128,128,128,.75)",
        "_brandNavigationItemBackgroundColorHover": "rgba(0,0,0,.2)",
        "_brandNavigationItemDividerColor": "rgba(255, 255, 255, 0.2)",
        "brandNavigationBackgroundColor": "rgb(128,128,128)",
        "brandNavigationBarBackgroundColor": "rgba(128,128,128,.75)",
        "brandNavigationColorText": "#FFFFFF"
    }
}