@salesforcedevs/dx-components 0.0.0-alpha.27 → 0.0.0-alpha.29

package/lwc.config.json

@@ -49,6 +49,7 @@
         "dx/input",
         "dx/logo",
         "dx/modal",
+        "dx/metadataBadge",
         "dx/modalDrawer",
         "dx/pagination",
         "dx/podcastHost",
@@ -72,10 +73,12 @@
         "dx/tooltip",
         "dx/tree",
         "dx/typeBadge",
-        "dx/typeBadgeGroup",
         "dx/vimeoPlayer",
         "dxBaseElements/headerBase",
         "dxBaseElements/matchMediaElement",
+        "dxConstants/brands",
+        "dxConstants/colors",
+        "dxConstants/contentTypes",
         "dxHelpers/animations",
         "dxHelpers/button",
         "dxHelpers/card",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "0.0.0-alpha.27",
+    "version": "0.0.0-alpha.29",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {

package/src/modules/dx/banner/banner.ts

@@ -3,7 +3,7 @@ import { setContainerInnerHtml } from "dxUtils/lwc";
 
 export default class Banner extends LightningElement {
     @api bannerMarkup =
-        '<span><a href="https://forms.gle/TdSyKFPHXoBx7seM9" target="blank">Share your feedback</a>about our new site.</span>';
+        'Thank you for visiting the Salesforce Developers website! <span><a href="https://forms.gle/oWYTbH9RvGyt9uxx7" target="blank">We value your feedback</a></span>';
 
     renderedCallback() {
         const container = this.template.querySelector(".info-container");

package/src/modules/dx/button/button.css

@@ -55,7 +55,6 @@
 .button.variant_inline dx-icon,
 .button.variant_inline-inherit dx-icon {
     display: inline-block;
-    transform: translate(0, -2px);
 }
 
 .button > span {
@@ -68,11 +67,6 @@
     font-family: var(--dx-g-font-display);
 }
 
-.button.font-display:not(.variant_inline):not(.variant_inline-inherit) > span {
-    /* offset accounts for display font's ghost padding */
-    margin-top: 5px;
-}
-
 .button.font-sans {
     font-family: var(--dx-g-font-sans);
 }

package/src/modules/dx/buttonToggle/buttonToggle.html

@@ -1,5 +1,6 @@
 <template>
     <button
+        aria-labelledby="label"
         class={className}
         onclick={handleMouseEvent}
         onmouseenter={handleMouseEvent}
@@ -9,7 +10,7 @@
         disabled={disabled}
     >
         <div class="label-container">
-            <span>{label}</span>
+            <span id="label">{label}</span>
             <dx-icon sprite="utility" symbol={symbol} size="small"></dx-icon>
         </div>
     </button>

package/src/modules/dx/buttonToggle/buttonToggle.ts

@@ -21,10 +21,10 @@ export default class ButtonToggle extends LightningElement {
         this._disabled = normalizeBoolean(value);
     }
 
-    private _value: boolean = false;
-    private _disabled: boolean = false;
-    private mouseHovering: boolean = false;
-    private hasFocus: boolean = false;
+    private _value = false;
+    private _disabled = false;
+    private mouseHovering = false;
+    private hasFocus = false;
 
     private get className(): string {
         return cx(this.value && "pressed");

package/src/modules/dx/cardEvent/cardEvent.html

@@ -44,8 +44,7 @@
                         {location}
                     </span>
                     <dx-type-badge
-                        color={brandType}
-                        type="content-type"
+                        color={typeBadgeColor}
                         value={type}
                         if:true={type}
                     ></dx-type-badge>

package/src/modules/dx/cardEvent/cardEvent.ts

@@ -36,7 +36,7 @@ export default class CardEvent extends LightningElement {
         this.isLinkHovered = false;
     }
 
-    private get brandType() {
+    private get typeBadgeColor() {
         return this.type === "Webinar" ? "green" : "red";
     }
 }

package/src/modules/dx/cardExpanded/cardExpanded.html

@@ -1,11 +1,6 @@
 <template>
     <div class={containerClass}>
-        <dx-type-badge
-            color={badgeColor}
-            type="content-type"
-            value={contentType}
-            size={badgeSize}
-        ></dx-type-badge>
+        <dx-type-badge variant={contentType} size={badgeSize}></dx-type-badge>
         <dx-card-title
             if:true={title}
             href={href}

package/src/modules/dx/cardExpanded/cardExpanded.ts

@@ -10,8 +10,8 @@ export default class ExpandedCard extends ArchiveCard {
     @api authorImgSrc?: string | null = null;
     @api length?: string;
 
-    private get isBlog() {
-        return this.contentType === "Blog";
+    private get isBlog(): boolean {
+        return this.contentType === "blog";
     }
 
     private get hasAuthor(): boolean {

package/src/modules/dx/cardMinimal/cardMinimal.html

@@ -3,11 +3,6 @@
         <a class="dx-text-truncate" href={href} target={target}>
             <h4>{title}</h4>
         </a>
-        <dx-type-badge
-            color={badgeColor}
-            size={badgeSize}
-            type="content-type"
-            value={contentType}
-        ></dx-type-badge>
+        <dx-type-badge variant={contentType} size={badgeSize}></dx-type-badge>
     </div>
 </template>

package/src/modules/dx/cardTrial/cardTrial.css

@@ -40,6 +40,7 @@ dx-card-title {
 
 dx-hr {
     --dx-c-hr-padding-horizontal: 0;
+
     width: 100%;
 }
 
@@ -97,14 +98,13 @@ dx-button {
     font-size: var(--dx-g-text-base);
 }
 
-.recommended-border {
+div.card-trial.recommended-border {
     border: 3px solid var(--dx-g-blue-vibrant-50);
-    /* overwrite inherited border-radius */
     border-radius: 0 0 var(--dx-g-card-border-radius)
-        var(--dx-g-card-border-radius) !important;
+        var(--dx-g-card-border-radius);
 }
 
-.recommended-border .top-text {
+.top-text .recommended-border {
     margin-top: var(--dx-g-spacing-mlg);
 }
 

package/src/modules/dx/cardTrialExpanded/cardTrialExpanded.css

@@ -33,6 +33,7 @@
 .button-cta {
     --dx-c-button-font-size: var(--dx-g-text-base);
     --dx-c-button-font-weight: var(--dx-g-font-bold);
+
     margin-top: 15px;
     width: 100%;
 }
@@ -52,6 +53,7 @@
 
 .button-close {
     --dx-c-button-background-color: white;
+
     margin-left: auto;
     pointer-events: all;
 }

package/src/modules/dx/featuredContentHeader/featuredContentHeader.css

@@ -254,12 +254,9 @@
     }
 }
 
-.custom-bg-big-moon::after {
-    background-image: url(/assets/svg/big-moon.svg);
-}
-
 .custom-bg-big-moon::after {
     content: "";
+    background-image: url(/assets/svg/big-moon.svg);
     background-position: top right;
     background-repeat: no-repeat;
     position: absolute;

package/src/modules/dx/featuresList/featuresList.css

@@ -20,5 +20,5 @@
 .icon {
     color: #3ba755;
     padding-right: var(--dx-g-spacing-md);
-    padding-top: var(--dx-g-spacing-2xs);
+    padding-top: var(--dx-g-spacing-sm);
 }

package/src/modules/dx/headerMobileNavMenu/headerMobileNavMenu.css

@@ -41,6 +41,7 @@
 
 .nav-menu.state-closed {
     opacity: 0;
+    visibility: hidden;
     transform: translateY(-16px);
     pointer-events: none;
 }

package/src/modules/dx/headerSearch/headerSearch.html

@@ -20,6 +20,7 @@
                     onclear={onInputEscape}
                     onsubmit={onInputSubmit}
                     onfocus={openDropdown}
+                    onblur={onDropdownRequestClose}
                     placeholder="Search"
                     size="override"
                     type="search"
@@ -51,6 +52,7 @@
                     onclear={onInputEscape}
                     onsubmit={onInputSubmit}
                     onfocus={openDropdown}
+                    onblur={onDropdownRequestClose}
                     placeholder="Search"
                     shortcut-key="k"
                     size="small"

package/src/modules/dx/headerSearch/headerSearch.ts

@@ -69,6 +69,7 @@ export default class HeaderSearch extends LightningElement {
         switch (e.detail as PopoverRequestCloseType) {
             case "interact-outside":
             case "keypress-escape":
+            case "input-blur":
                 this.closeDropdown();
                 break;
             default:

package/src/modules/dx/hr/hr.css

@@ -13,7 +13,7 @@ h2 {
     font-family: var(--dx-g-font-display);
     font-size: var(--dx-g-text-sm);
     color: var(--dx-g-blue-vibrant-20);
-    text-transform: uppercase;
+    text-transform: capitalize;
     letter-spacing: 0;
     line-height: 18px;
 }
@@ -22,7 +22,6 @@ p::before,
 h2::before,
 p::after,
 h2::after {
-    transform: translateY(-2px); /* offset for display font ghost padding */
     content: "";
     flex: 1 1;
     border-bottom: 2px solid var(--dx-g-gray-95);
@@ -42,7 +41,7 @@ h2::after {
 dx-button {
     display: flex;
     width: 100%;
-    text-transform: uppercase;
+    text-transform: capitalize;
     padding: 0 var(--dx-c-hr-padding-horizontal);
 }
 

package/src/modules/dx/imageAndLabel/imageAndLabel.css

@@ -17,7 +17,6 @@ img {
 }
 
 span {
-    margin-top: 3px;
     white-space: nowrap;
 }
 

package/src/modules/dx/input/input.ts

@@ -186,6 +186,8 @@ export default class Input extends LightningElement {
         if (this.validityOnBlur) {
             this.reportValidity();
         }
+
+        this.dispatchEvent(new CustomEvent("blur", { detail: "input-blur" }));
     }
 
     onInputChange(e: InputEvent) {

package/src/modules/dx/logo/logo.css

@@ -23,7 +23,6 @@ a:hover {
 }
 
 .logo-link > span {
-    margin-top: 3px;
     color: var(--dx-c-logo-label-color);
 }
 

package/src/modules/dx/metadataBadge/metadataBadge.css

@@ -0,0 +1,41 @@
+@import "dxHelpers/reset";
+
+.badge {
+    --background: var(--dx-g-cloud-blue-natural-90);
+    --border-radius: var(--dx-g-spacing-xs);
+    --color: var(--dx-g-blue-vibrant-20);
+    --height: var(--dx-g-spacing-lg);
+    --horizontal-spacing: var(--dx-g-spacing-sm);
+
+    color: var(--dx-c-metadata-badge-color, var(--color));
+    background: var(--dx-c-metadata-badge-background, var(--background));
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: var(--height);
+    width: min-content;
+    padding: 0 var(--horizontal-spacing);
+    border-radius: var(--border-radius);
+    font-family: var(--dx-g-font-display);
+    font-size: 10px;
+    text-align: center;
+    letter-spacing: 0.6px;
+    text-transform: uppercase;
+    white-space: nowrap;
+}
+
+.badge.size-small {
+    --height: var(--dx-g-spacing-md);
+    --horizontal-spacing: var(--dx-g-spacing-xs);
+
+    font-size: 8px;
+    letter-spacing: 0.5px;
+}
+
+@media screen and (max-width: 768px) {
+    .badge:not(.size-small) {
+        height: var(--dx-g-spacing-lg);
+        padding: 0 var(--dx-g-spacing-sm);
+        font-size: var(--dx-g-text-2xs);
+    }
+}

package/src/modules/dx/metadataBadge/metadataBadge.html

@@ -0,0 +1,5 @@
+<template>
+    <div class={className} style={style}>
+        <span>{value}</span>
+    </div>
+</template>

package/src/modules/dx/metadataBadge/metadataBadge.ts

@@ -0,0 +1,24 @@
+import { LightningElement, api } from "lwc";
+import cx from "classnames";
+import { Color, TypeBadgeSize } from "typings/custom";
+import { colorToDxColors, buildStyleColorVariables } from "dxUtils/css";
+
+export default class MetadataBadge extends LightningElement {
+    @api size: TypeBadgeSize = "default";
+    @api color?: Color;
+    @api value!: string;
+
+    private get className(): string {
+        return cx("badge", `size-${this.size}`);
+    }
+
+    private get style(): string {
+        if (this.color) {
+            const variables = colorToDxColors(this.color as Color);
+            if (variables) {
+                return buildStyleColorVariables(variables);
+            }
+        }
+        return "";
+    }
+}

package/src/modules/dx/modal/modal.html

@@ -1,5 +1,5 @@
 <template>
-    <div class={containerClass} tabindex="0">
+    <div class={containerClass} tabindex="0" role="dialog">
         <slot></slot>
     </div>
     <div

package/src/modules/dx/modal/modal.ts

@@ -27,11 +27,7 @@ export default class Modal extends LightningElement {
     }
 
     connectedCallback(): void {
-        document.addEventListener("keydown", this.handleKeyDown.bind(this));
-    }
-
-    disconnectedCallback(): void {
-        document.removeEventListener("keydown", this.handleKeyDown);
+        this.template.addEventListener("keydown", this.handleKeyDown);
     }
 
     focusFirstElement(): void {

package/src/modules/dx/modalDrawer/modalDrawer.html

@@ -1,5 +1,5 @@
 <template>
-    <div class={containerClass} onkeydown={handleKeyDown} tabindex="0">
+    <div class={containerClass}>
         <slot></slot>
         <dx-button onclick={handleToggleModal}>Done</dx-button>
     </div>

package/src/modules/dx/pagination/pagination.css

@@ -27,8 +27,7 @@
 }
 
 .dx-pagination-pages button {
-    padding: var(--dx-g-spacing-sm) var(--dx-g-spacing-md)
-        var(--dx-g-spacing-2xs) var(--dx-g-spacing-md);
+    padding: var(--dx-g-spacing-xs) var(--dx-g-spacing-md);
     border-radius: var(--dx-g-spacing-lg);
     font-family: var(--dx-g-font-display);
     font-size: var(--dx-g-text-sm);

package/src/modules/dx/sidebarSearch/sidebarSearch.html

@@ -18,6 +18,7 @@
             value={value}
             onchange={onInputChange}
             onfocus={onInputFocus}
+            onblur={onDropdownRequestClose}
             onclear={onInputClear}
             shortcut-key="j"
             clearable

package/src/modules/dx/sidebarSearch/sidebarSearch.ts

@@ -422,6 +422,7 @@ export default class SidebarSearch extends LightningElement {
         switch (e.detail as PopoverRequestCloseType) {
             case "interact-outside":
             case "keypress-escape":
+            case "input-blur":
                 this.dropdownRequestedOpen = false;
                 break;
             default:

package/src/modules/dx/tab/tab.css

@@ -38,10 +38,6 @@ a {
     margin: 0 var(--horizontal-spacing);
 }
 
-.nav-list-item > span {
-    margin-top: var(--dx-g-spacing-xs);
-}
-
 button.nav-list-item_default > dx-icon {
     margin-left: var(--dx-g-spacing-sm);
 }

package/src/modules/dx/treeItem/treeItem.html

@@ -9,6 +9,7 @@
             is-selected={isSelected}
             oniconclick={onIconClick}
             show-arrow={isParent}
+            target={target}
         ></dx-tree-tile>
     </a>
     <img

package/src/modules/dx/treeTile/treeTile.css

@@ -145,33 +145,33 @@
     --indentation: calc(20 * var(--base-indentation));
 }
 
-dx-type-badge {
-    --dx-c-type-badge-text-width: 21px;
+dx-metadata-badge {
+    --dx-c-metadata-badge-text-width: 21px;
 }
 
-dx-type-badge.get {
-    --dx-c-type-badge-color: var(--dx-g-blue-vibrant-50);
-    --dx-c-type-badge-background: var(--dx-g-blue-vibrant-90);
+dx-metadata-badge.get {
+    --dx-c-metadata-badge-color: var(--dx-g-blue-vibrant-50);
+    --dx-c-metadata-badge-background: var(--dx-g-blue-vibrant-90);
 }
 
-dx-type-badge.put {
-    --dx-c-type-badge-color: var(--dx-g-yellow-vibrant-40);
-    --dx-c-type-badge-background: var(--dx-g-yellow-vibrant-90);
+dx-metadata-badge.put {
+    --dx-c-metadata-badge-color: var(--dx-g-yellow-vibrant-40);
+    --dx-c-metadata-badge-background: var(--dx-g-yellow-vibrant-90);
 }
 
-dx-type-badge.post {
-    --dx-c-type-badge-color: var(--dx-g-green-vibrant-40);
-    --dx-c-type-badge-background: var(--dx-g-green-vibrant-90);
+dx-metadata-badge.post {
+    --dx-c-metadata-badge-color: var(--dx-g-green-vibrant-40);
+    --dx-c-metadata-badge-background: var(--dx-g-green-vibrant-90);
 }
 
-dx-type-badge.patch {
-    --dx-c-type-badge-color: var(--dx-g-teal-vibrant-40);
-    --dx-c-type-badge-background: var(--dx-g-teal-vibrant-90);
+dx-metadata-badge.patch {
+    --dx-c-metadata-badge-color: var(--dx-g-teal-vibrant-40);
+    --dx-c-metadata-badge-background: var(--dx-g-teal-vibrant-90);
 }
 
-dx-type-badge.delete {
-    --dx-c-type-badge-color: var(--dx-g-red-vibrant-40);
-    --dx-c-type-badge-background: var(--dx-g-hot-orange-vibrant-90);
+dx-metadata-badge.delete {
+    --dx-c-metadata-badge-color: var(--dx-g-red-vibrant-40);
+    --dx-c-metadata-badge-background: var(--dx-g-hot-orange-vibrant-90);
 }
 
 a {

package/src/modules/dx/treeTile/treeTile.html

@@ -1,5 +1,5 @@
 <template>
-    <a href={href} class={tileClass}>
+    <a href={href} class={tileClass} target={target}>
         <div class="flex indentation" aria-level={tileAriaLevel}>
             <span
                 class="tile-label sidebar-item-truncate-text"
@@ -16,12 +16,13 @@
                     onclick={onClickIcon}
                 ></dx-icon>
             </div>
-            <dx-type-badge
+            <dx-metadata-badge
                 if:true={showMethod}
-                class={badgeClass}
+                class="flex tile-icon"
                 size="small"
                 value={methodText}
-            ></dx-type-badge>
+                color={metadataBadgeColor}
+            ></dx-metadata-badge>
         </div>
     </a>
 </template>

package/src/modules/dx/treeTile/treeTile.ts

@@ -1,6 +1,6 @@
 import { LightningElement, api } from "lwc";
 import cx from "classnames";
-import { InternalTreeNode } from "typings/custom";
+import { Color, InternalTreeNode } from "typings/custom";
 
 const methodTextMap: {
     [key: string]: string;
@@ -12,6 +12,16 @@ const methodTextMap: {
     delete: "DELE"
 };
 
+const metadataBadgeColorMap: {
+    [key: string]: Color;
+} = {
+    get: "blue",
+    put: "yellow",
+    post: "green",
+    patch: "teal",
+    delete: "red"
+};
+
 export default class TreeTile extends LightningElement {
     @api isRoot = false;
     @api treeNode!: InternalTreeNode;
@@ -20,6 +30,7 @@ export default class TreeTile extends LightningElement {
     @api isSelected = false;
     @api href!: string;
     @api showArrow = false;
+    @api target!: string;
 
     get tileAriaLevel() {
         return this.treeNode.level + 2;
@@ -29,8 +40,11 @@ export default class TreeTile extends LightningElement {
         return this.isRoot ? "small" : "xsmall";
     }
 
-    private get badgeClass() {
-        return cx("flex", "tile-icon", this.treeNode.method);
+    private get metadataBadgeColor(): string | undefined {
+        if (this.treeNode.method) {
+            return metadataBadgeColorMap[this.treeNode.method];
+        }
+        return undefined;
     }
 
     private get showMethod() {

package/src/modules/dx/typeBadge/typeBadge.css

@@ -1,33 +1,6 @@
 @import "dxHelpers/reset";
 
-.typebadge {
-    align-items: center;
-    background: var(--dx-c-type-badge-background, var(--background));
-    border-radius: var(--dx-c-type-badge-border-radius, var(--border-radius));
-    color: var(--dx-c-type-badge-color, var(--color));
-    display: flex;
-    justify-content: center;
-    height: var(--dx-c-type-badge-height, var(--height));
-    text-align: center;
-    white-space: nowrap;
-    width: min-content;
-}
-
-.typebadge.typebadge_metadata {
-    --background: var(--dx-g-cloud-blue-natural-90);
-    --border-radius: var(--dx-g-spacing-xs);
-    --color: var(--dx-g-blue-vibrant-20);
-    --height: var(--dx-g-spacing-md);
-    --horizontal-spacing: var(--dx-g-spacing-sm);
-
-    font-family: var(--dx-g-font-display);
-    font-size: 10px;
-    letter-spacing: 0.6px;
-    text-transform: var(--dx-c-type-badge-text-transform, uppercase);
-    padding: 0 var(--horizontal-spacing);
-}
-
-.typebadge.typebadge_content-type {
+.badge {
     --background: var(--sds-g-gray-3);
     --border-radius: var(--dx-g-spacing-smd);
     --color: var(--sds-g-gray-10);
@@ -35,40 +8,26 @@
     --horizontal-spacing: var(--dx-g-spacing-smd);
     --vertical-spacing: var(--dx-g-spacing-xs);
 
+    color: var(--dx-c-type-badge-color, var(--color));
+    background: var(--dx-c-type-badge-background, var(--background));
+    border-radius: var(--border-radius);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: var(--height);
+    width: min-content;
+    text-align: center;
+    white-space: nowrap;
     font-family: var(--dx-g-font-sans);
-    font-size: var(--dx-g-text-xs);
+    font-size: 10px;
     font-weight: var(--dx-g-font-bold);
     padding: var(--vertical-spacing) var(--horizontal-spacing);
 }
 
-.typebadge.typebadge_content-type.size-small {
+.badge.size-small {
     --height: var(--dx-g-spacing-mlg);
-    --horizontal-spacing: var(--dx-g-spacing-sm);
-
-    font-size: 10px;
-}
-
-.typebadge.typebadge_metadata.size-small {
-    --height: var(--dx-g-spacing-md);
-    --horizontal-spacing: var(--dx-g-spacing-xs);
-
-    font-size: 8px;
-    letter-spacing: 0.5px;
-}
-
-.typebadge.typebadge_metadata span {
-    transform: translateY(2px);
-    width: var(--dx-c-type-badge-text-width, unset);
-}
-
-.typebadge.typebadge_metadata.size-small span {
-    transform: translateY(1px);
 }
 
-@media screen and (max-width: 768px) {
-    .typebadge.typebadge_metadata:not(.size-small) {
-        height: var(--dx-g-spacing-lg);
-        padding: 0 var(--dx-g-spacing-sm);
-        font-size: var(--dx-g-text-2xs);
-    }
+dx-icon {
+    margin-right: var(--dx-g-spacing-sm);
 }

package/src/modules/dx/typeBadge/typeBadge.html

@@ -1,5 +1,11 @@
 <template>
     <div class={className} style={style}>
+        <dx-icon
+            if:true={iconSymbol}
+            symbol={iconSymbol}
+            sprite={iconSprite}
+            size="xsmall"
+        ></dx-icon>
         <span>{value}</span>
     </div>
 </template>

package/src/modules/dx/typeBadge/typeBadge.ts

@@ -1,65 +1,161 @@
 import { LightningElement, api } from "lwc";
 import cx from "classnames";
 import {
-    TypeBadgeColor,
+    Brand,
     Color,
-    TypeBadgeSize,
-    BadgeType,
-    Brand
+    ContentType,
+    IconSprite,
+    IconSymbol,
+    TypeBadgeSize
 } from "typings/custom";
-import { colorToDxColors } from "dxUtils/css";
-
-const DEFAULT_TYPE = "typebadge_metadata";
-const VALID_BRANDS: Array<Brand> = [
-    "employees",
-    "marketing",
-    "partners",
-    "commerce",
-    "sales",
-    "success",
-    "integration",
-    "platform",
-    "industries",
-    "learning",
-    "service",
-    "analytics"
-];
+import { colorToDxColors, buildStyleColorVariables } from "dxUtils/css";
+import { BRANDS } from "dxConstants/brands";
+import { CONTENT_TYPES } from "dxConstants/contentTypes";
+
+const contentTypeLabels = {
+    documentation: "Documentation",
+    trailhead: "Trailhead",
+    blog: "Blog",
+    forum: "Forum",
+    api: "API",
+    event: "Event",
+    website: "Website",
+    podcast: "Podcast"
+};
+
+type IconData = {
+    iconSymbol: IconSymbol;
+    iconSprite: IconSprite;
+};
+
+const contentTypeIcons: {
+    [K in ContentType]: IconData;
+} = {
+    documentation: {
+        iconSprite: "utility",
+        iconSymbol: "knowledge_base"
+    },
+    trailhead: {
+        iconSprite: "salesforcebrand",
+        iconSymbol: "learning"
+    },
+    blog: {
+        iconSprite: "utility",
+        iconSymbol: "comments"
+    },
+    forum: {
+        iconSprite: "general",
+        iconSymbol: "question-circle"
+    },
+    api: {
+        iconSprite: "utility",
+        iconSymbol: "settings"
+    },
+    event: {
+        iconSprite: "utility",
+        iconSymbol: "event"
+    },
+    website: {
+        iconSprite: "utility",
+        iconSymbol: "home"
+    },
+    podcast: {
+        iconSprite: "utility",
+        iconSymbol: "unmuted"
+    }
+};
 
 export default class TypeBadge extends LightningElement {
     @api size: TypeBadgeSize = "default";
-    @api value: string = "";
-    @api color?: TypeBadgeColor = "default";
-    @api type?: BadgeType = "metadata";
+    @api variant?: Brand | ContentType = "default";
+    @api color?: Color;
+
+    @api
+    get iconSymbol(): IconSymbol | undefined {
+        return this.variantIconData
+            ? this.variantIconData.iconSymbol
+            : this._iconSymbol;
+    }
+    set iconSymbol(value: IconSymbol | undefined) {
+        if (value) {
+            this._iconSymbol = value;
+        }
+    }
+
+    @api
+    get iconSprite(): IconSprite | undefined {
+        return this.variantIconData
+            ? this.variantIconData.iconSprite
+            : this._iconSprite;
+    }
+    set iconSprite(value: IconSprite | undefined) {
+        if (value) {
+            this._iconSprite = value;
+        }
+    }
+
+    @api
+    get value(): string {
+        return this._value || this.variantLabel || "";
+    }
+
+    set value(value) {
+        if (value) {
+            this._value = value;
+        }
+    }
+
+    private _value?: string;
+    private _iconSprite?: IconSprite;
+    private _iconSymbol?: IconSymbol;
+
+    private get variantIconData(): IconData | null {
+        if (this.variant && this.variant in contentTypeIcons) {
+            return contentTypeIcons[this.variant as ContentType];
+        }
+        return null;
+    }
+
+    private get variantLabel(): string | null {
+        if (this.isContentType) {
+            return contentTypeLabels[this.variant as ContentType];
+        }
+        return null;
+    }
+
+    private get variantColorScope(): string | null {
+        if (this.isContentType) {
+            return "content-type";
+        }
+        if (this.isBrand) {
+            return "brand";
+        }
+        return null;
+    }
+
+    private get isContentType(): boolean {
+        return CONTENT_TYPES.includes(this.variant as ContentType);
+    }
+
+    private get isBrand(): boolean {
+        return BRANDS.includes(this.variant as ContentType);
+    }
 
     private get className(): string {
-        return cx(
-            "typebadge",
-            `size-${this.size}`,
-            (this.type && `typebadge_${this.type}`) || DEFAULT_TYPE
-        );
+        return cx("badge", `size-${this.size}`);
     }
 
     private get style(): string {
-        if (VALID_BRANDS.includes(this.color as Brand)) {
-            return this.buildStyleString({
-                background: `--dx-g-brand-${this.color}-color-background`,
-                color: `--dx-g-brand-${this.color}-color`
+        if (this.variantColorScope) {
+            return buildStyleColorVariables({
+                background: `--dx-g-${this.variantColorScope}-${this.variant}-color-background`,
+                color: `--dx-g-${this.variantColorScope}-${this.variant}-color`
             });
         }
-        const variables = colorToDxColors(this.color as Color);
-        if (variables) {
-            return this.buildStyleString(variables);
+        if (this.color) {
+            const variables = colorToDxColors(this.color as Color);
+            return buildStyleColorVariables(variables);
         }
         return "";
     }
-
-    private buildStyleString({
-        background,
-        color
-    }: {
-        background: string;
-        color: string;
-    }): string {
-        return `--color: var(${color}); --background: var(${background})`;
-    }
 }

package/src/modules/dxBaseElements/archiveCard/archiveCard.ts

@@ -1,10 +1,10 @@
 import { LightningElement, api } from "lwc";
-import { LinkTarget, Color } from "typings/custom";
+import { LinkTarget, ContentType } from "typings/custom";
 
 const MOBILE_QUERY = "(max-width: 640px)";
 
 export abstract class ArchiveCard extends LightningElement {
-    @api contentType: "Blog" | "Podcast" = "Blog";
+    @api contentType!: ContentType;
     @api href!: string;
     @api title!: string;
     @api target: LinkTarget = "_self";
@@ -12,10 +12,6 @@ export abstract class ArchiveCard extends LightningElement {
     private matchMedia!: MediaQueryList;
     protected mobile = false;
 
-    protected get badgeColor(): Color {
-        return this.contentType === "Blog" ? "teal" : "blue";
-    }
-
     connectedCallback(): void {
         this.matchMedia = window.matchMedia(MOBILE_QUERY);
         this.onMediaChange(this.matchMedia);

package/src/modules/dxBaseElements/headerBase/headerBase.ts

@@ -42,7 +42,7 @@ export abstract class HeaderBase extends LightningElement {
     @api title: string = "Salesforce";
     @api version?: string | null = null;
     @api bannerMarkup =
-        '<span><a href="https://forms.gle/oWYTbH9RvGyt9uxx7" target="blank">Share your feedback</a>about our new site.</span>';
+        'Thank you for visiting the Salesforce Developers website! <span><a href="https://forms.gle/oWYTbH9RvGyt9uxx7" target="blank">We value your feedback</a></span>';
 
     @api
     get navItems() {

package/src/modules/dxConstants/brands/brands.ts

@@ -0,0 +1,14 @@
+export const BRANDS = [
+    "employees",
+    "marketing",
+    "partners",
+    "commerce",
+    "sales",
+    "success",
+    "integration",
+    "platform",
+    "industries",
+    "learning",
+    "service",
+    "analytics"
+];

package/src/modules/dxConstants/colors/colors.ts

@@ -0,0 +1,14 @@
+export const COLORS = [
+    "hot-orange",
+    "orange",
+    "yellow",
+    "green",
+    "teal",
+    "cloud-blue",
+    "blue",
+    "indigo",
+    "purple",
+    "violet",
+    "pink",
+    "red"
+];

package/src/modules/dxConstants/contentTypes/contentTypes.ts

@@ -0,0 +1,10 @@
+export const CONTENT_TYPES = [
+    "documentation",
+    "trailhead",
+    "blog",
+    "forum",
+    "api",
+    "event",
+    "website",
+    "podcast"
+];

package/src/modules/dxHelpers/card/card.css

@@ -170,7 +170,7 @@ a.dx-card-base:hover a.dx-card-base_borderless-image_link {
 dx-card-title:hover,
 .dx-card-base_link-hovered dx-card-title,
 a.dx-card-base:hover dx-card-title {
-    --dx-c-card-title-color: var(--dx-g-button-heading-color-hover);
+    --dx-c-card-title-color: var(--dx-g-blue-vibrant-50);
 }
 
 /* Line Limits */

package/src/modules/dxHelpers/commonHeader/commonHeader.css

@@ -83,7 +83,6 @@ header.state-show-mobile-nav .header_l2_group-nav_overflow {
 }
 
 .header_l2_group-title .subtitle {
-    transform: translateY(4px); /* ghost padding */
     margin-right: var(--dx-g-spacing-md);
 }
 

package/src/modules/dxUtils/css/css.ts

@@ -41,3 +41,13 @@ export const colorToDxColors = (
 
 export const toDxColor = (color: string) =>
     ["white", "transparent"].includes(color) ? color : `var(--dx-g-${color})`;
+
+export const buildStyleColorVariables = ({
+    background,
+    color
+}: {
+    background: string;
+    color: string;
+}): string => {
+    return `--color: var(${color}); --background: var(${background})`;
+};

package/src/modules/dx/typeBadgeGroup/typeBadgeGroup.css

@@ -1,12 +0,0 @@
-.badges-group {
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.badges-group > dx-type-badge {
-    margin-bottom: var(--dx-g-spacing-sm);
-}
-
-.badges-group > dx-type-badge:not(:last-child) {
-    margin-right: var(--dx-g-spacing-sm);
-}

package/src/modules/dx/typeBadgeGroup/typeBadgeGroup.html

@@ -1,11 +0,0 @@
-<template>
-    <div class="badges-group">
-        <template for:each={badges} for:item="badge">
-            <dx-type-badge
-                key={badge}
-                size={size}
-                value={badge}
-            ></dx-type-badge>
-        </template>
-    </div>
-</template>

package/src/modules/dx/typeBadgeGroup/typeBadgeGroup.ts

@@ -1,18 +0,0 @@
-import { LightningElement, api } from "lwc";
-import { normalizeToArray } from "dxUtils/normalizers";
-import { TypeBadgeSize } from "typings/custom";
-
-export default class TypeBadgeGroup extends LightningElement {
-    @api size: TypeBadgeSize = "medium";
-
-    @api
-    get badges() {
-        return this._badges;
-    }
-    set badges(value: string[] | string | null) {
-        this._badges = normalizeToArray(value);
-    }
-
-    // can be an array of strings or a comma delimited string
-    private _badges!: string | string[] | null;
-}