Skip to content

Commit

Permalink
eschweitzer78/2024-06-13-2000 (#368)
Browse files Browse the repository at this point in the history
* Progress VIC2 DS theme

* VIC2 DS version
  • Loading branch information
eschweitzer78 authored Jun 13, 2024
1 parent aa848d9 commit 4de031e
Show file tree
Hide file tree
Showing 6 changed files with 139 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
description="VIC DS v2 Theme Layout"
>
<ltng:require
styles="{! join(',', $Resource.sfGpsDsAuVic2 + '/assets/styles/global.css', $Resource.sfGpsDsAuVic2 + '/assets/styles/style.css')}"
styles="{! join(',', $Resource.sfGpsDsAuVic2 + '/global.css', $Resource.sfGpsDsAuVic2 + '/style.css', $Resource.sfGpsDsAuVic2 + '/byo-aura_layout.css')}"
/>

<aura:attribute name="header" type="Aura.Component[]" required="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.siteforceContentArea
.comm-layout-column
.ui-widget:not(:last-child),
.THIS.sfgpsdswidget--no-margin
.THIS.sfgpsds-widget--no-margin
.siteforceContentArea
.cb-section_column
.ui-widget:not(:last-child) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<design:component label="VIC Design System v2 Theme Layout">
<design:component label="VIC2 DS Theme Layout">
<design:attribute name="hideHeader" label="Hide main header" description="Hides the standard header.">
</design:attribute>
<design:attribute name="noWidgetMargin" label="No widget margin" description="Removes the standard widget margin.">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@

<brandingSetProperty>
<propertyName>PrimaryFont</propertyName>
<propertyValue>VIC-Regular</propertyValue>
<propertyValue>VIC</propertyValue>
</brandingSetProperty>
<brandingSetProperty>
<propertyName>HeaderFonts</propertyName>
<propertyValue>VIC-Bold</propertyValue>
<propertyValue>VIC</propertyValue>
</brandingSetProperty>
<brandingSetProperty>
<propertyName>TextTransformStyle</propertyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@

.siteforceContentArea .forceCommunitySection {
max-width: 120rem;
margin-left: auto;
margin-right: auto;
padding: 0 var(--rpl-sp-4);
}

@media (min-width:768px) {
.siteforceContentArea .forceCommunitySection {
padding: 0 var(--rpl-sp-8);
}
}

@media (min-width:992px) {
.siteforceContentArea .forceCommunitySection {
padding: 0 var(--rpl-sp-12);
}
}

@media (min-width:1200px) {
.siteforceContentArea .forceCommunitySection {
padding: 0 var(--rpl-sp-13);
}
}

/* SECOND SECTION SHOULD BE FULL-WIDTH
AND BE FLUSH WITH PREVIOUS AND NEXT SECTION */

.siteforceContentArea .siteforceDesignTimeSection:nth-child(2) .forceCommunitySection,
.siteforceContentArea > div > .ui-widget:nth-child(2) .forceCommunitySection {
max-width: none;
padding-left: 0;
padding-right: 0;
}

/* ALTERNATE BACKGROUND COLOURS */

.siteforceContentArea .siteforceDesignTimeSection:nth-child(2n + 4),
.siteforceContentArea > div > .ui-widget:nth-child(2n + 4) {
background-color: var(--gotf-section-background, #f1f1f1);
}

/* GRID */

.siteforceContentArea .forceCommunitySection .cb-section_column,
.siteforceContentArea .forceCommunitySection .cb-section_column:first-child,
.siteforceContentArea .forceCommunitySection .cb-section_column:last-child {
padding: 0;
}

@media (min-width: 48rem) {
.siteforceContentArea .forceCommunitySection .cb-section_column,
.siteforceContentArea .forceCommunitySection .cb-section_column:first-child,
.siteforceContentArea .forceCommunitySection .cb-section_column:last-child {
padding: 0;
}
}

.cb-section_row {
min-height: 0 !important;
gap: 1rem; /* ESC */
align-items: stretch;
}

@media (min-width: 48rem) {
.cb-section_row {
gap: 2rem; /* ESC */
}
}

@media (min-width: 64em) {
.cb-section_column.slds-large-size_1-of-12 {
width: auto;
flex: 1;
}

.cb-section_column.slds-large-size_2-of-12 {
width: auto;
flex: 2;
}

.cb-section_column.slds-large-size_3-of-12 {
width: auto;
flex: 3;
}

.cb-section_column.slds-large-size_4-of-12 {
width: auto;
flex: 4;
}

.cb-section_column.slds-large-size_5-of-12 {
width: auto;
flex: 5;
}

.cb-section_column.slds-large-size_6-of-12 {
width: auto;
flex: 6;
}

.cb-section_column.slds-large-size_7-of-12 {
width: auto;
flex: 7;
}

.cb-section_column.slds-large-size_8-of-12 {
width: auto;
flex: 8;
}

.cb-section_column.slds-large-size_9-of-12 {
width: auto;
flex: 9;
}

.cb-section_column.slds-large-size_10-of-12 {
width: auto;
flex: 10;
}

.cb-section_column.slds-large-size_11-of-12 {
width: auto;
flex: 11;
}

.cb-section_column.slds-large-size_12-of-12 {
width: auto;
flex: 12;
}
}
4 changes: 2 additions & 2 deletions sfdx-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
{
"path": "sfGpsDsAuVic2Full",
"package": "Salesforce Global Public Sector AU VIC2 Design System",
"versionName": "2024.06.08.2330",
"versionNumber": "0.2.4.NEXT",
"versionName": "2024.06.13.2000",
"versionNumber": "0.2.5.NEXT",
"default": false,
"definitionFile": "config/project-deployment-def.json",
"dependencies": [
Expand Down

0 comments on commit 4de031e

Please sign in to comment.