Skip to content

Commit

Permalink
Merge branch 'release/2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleykolodziej committed Sep 28, 2020
2 parents 5a4b2f7 + 08378bd commit a79ec99
Show file tree
Hide file tree
Showing 38 changed files with 3,834 additions and 1,693 deletions.
12 changes: 8 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
# Changelog

## Unreleased
## 2.4.0

- Updated and improved styles for BU Landing Pages and color palettes.

## 2.3.15
Fix for the url label in the calendar, from "Registration" to "Link"

- Fix for the url label in the calendar, from "Registration" to "Link"

## 2.3.14

Adds additional actions for the mega menu.
- Adds additional actions for the mega menu.

## 2.3.13

**Hotfix** Fixed an issue where the calendar id was not being returned properly.
- **Hotfix** Fixed an issue where the calendar id was not being returned properly.

## 2.3.12

- Removes sasslint in favor of stylelint due to security warnings.
- Adds a filter to BU Calendar to override the calendar id.
- Adds a filter to BU Calendar to override the default months to show.
Expand Down
200 changes: 200 additions & 0 deletions css-dev/customizer/color-palettes/_styles-bulp.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
$bulp-event-bg: $color-primary !default;
$bulp-event-color: lighten( $bulp-event-bg, 70% ) !default;
$bulp-event-icon-bg: lighten( $bulp-event-bg, 30% ) !default;
$bulp-event-border: darken( $bulp-event-bg, 30% ) !default;
$bulp-event-link: $bulp-event-color !default;
$bulp-event-divider: lighten( $bulp-event-bg, 15% ) !default;

$bulp-promo-btn-bg: $color-tertiary !default;
$bulp-promo-btn-text: $color-grayscale-f !default;

$bulp-register-btn-bg: $color-tertiary !default;
$bulp-register-btn-text: $color-grayscale-f !default;

$bulp-category-topic-bg: lighten( $color-primary, 15% ) !default;
$bulp-category-topic-color: $color-grayscale-f !default;

$bulp-bu-banner-button-bg: $color-primary !default;

$bulp-largepromo-button-bg: $color-primary !default;
$bulp-largepromo-button-text: $color-grayscale-f !default;

$bulp-intro-title-bg: $color-dark !default;
$bulp-readmore-button-text: #333 !default;

$bulp-section-even-bg: mix( #eee, $color-primary, 95% ) !default;
$bulp-section-even-color: inherit !default;

$bulp-child-nav-article-border: $color-secondary !default;
$bulp-child-nav-article-bg: $color-grayscale-f !default;
$bulp-child-nav-article-hover: $bulp-child-nav-article-border !default;

$bulp-border-color: $color-primary !default;

$bulp-article-btn-bg: $color-tertiary !default;
$bulp-article-btn-color: $color-grayscale-f !default;

$bulp-event-readmore-bg: $color-tertiary !default;
$bulp-event-readmore-color: darken( $bulp-event-readmore-bg, 70% ) !default;


@media screen {

.bulp-intro-title,
.bulp-largepromo-title {
color: $bulp-intro-title-bg;
}

.bu-banner-button {
background-color: $bulp-bu-banner-button-bg;
}

.bulp-promo,
.bulp-article {
&::before {
background: $bulp-border-color;
}
}

.bulp-promo-button {
background-color: $bulp-promo-btn-bg;
color: $bulp-promo-btn-text;

&:hover {
color: $bulp-promo-btn-text;
}
}

.bulp-event {
background: $bulp-event-bg;
color: #fff;
}

.bulp-event-title,
.bulp-event-when {
color: accessible-text( $bulp-event-bg, $bulp-event-color );
}

.bulp-event-when {
border-color: $bulp-event-divider;
}

.bulp-section:nth-child(2n+1) .bulp-event {
border-top-color: $bulp-event-border;
border-left-color: $bulp-event-bg;
border-right-color: $bulp-event-bg;
border-bottom-color: $bulp-event-bg;
}

.bulp-event-address {
color: accessible-text( $bulp-event-bg, $bulp-event-link );
}

.bulp-event-readmore {
background: $bulp-event-readmore-bg;
color: accessible-text( $bulp-event-readmore-bg, $bulp-event-readmore-color );

&:visited,
&:active {
color: accessible-text( $bulp-event-readmore-bg, $bulp-event-readmore-color );
}

&:hover {
background: lighten( $bulp-event-readmore-bg, 10% );
}
}

.bulp-event-register {
background-color: $bulp-register-btn-bg;
color: $bulp-register-btn-text;

&:hover {
color: $bulp-register-btn-text;
}
}

.bulp-largepromo-button {
background-color: $bulp-largepromo-button-bg;
color: $bulp-largepromo-button-text;

&:hover {
color: $bulp-largepromo-button-text;
}
}

.bulp-event-when,
.bulp-event-where {
&::before {
color: $bulp-event-icon-bg;
}
}

.bulp-article-category,
.bulp-event-topic-text {
background-color: $bulp-category-topic-bg;
color: accessible-text( $bulp-category-topic-bg, $bulp-category-topic-color );
}

.bulp-article-readmore {
background-color: $bulp-article-btn-bg;
color: accessible-text( $bulp-article-btn-bg, $bulp-article-btn-color );
}

.bulp-section:nth-child(even) {
background-color: $bulp-section-even-bg;
color: $bulp-section-even-color;

.bulp-intro-title {
color: inherit;
}
}

.bulp-child-nav-item {
background-color: $bulp-child-nav-article-bg;
border-color: $bulp-child-nav-article-border;
box-shadow: 0 3px 20px -1px rgba( 0, 0, 0, 0.12 ), 0 2px 8px -3px rgba( 0, 0, 0, 0.06 );
color: accessible-text( $bulp-child-nav-article-bg, darken( $bulp-child-nav-article-border, 10% ) );
font-weight: 700;
position: relative;
z-index: 1;

&::before {
background: $bulp-child-nav-article-hover;
bottom: 0;
content: "";
left: 0;
position: absolute;
right: 0;
top: 0;
transform-origin: 0 50%;
transform: scaleX( 0 );
transition-duration: 0.3s;
transition-property: transform;
transition-timing-function: ease-out;
z-index: -1;
-webkit-transform-origin: 0 50%;
-webkit-transform: scaleX( 0 );
-webkit-transition-duration: 0.3s;
-webkit-transition-property: transform;
-webkit-transition-timing-function: ease-out;
}

&:hover {
background-color: transparent;
color: accessible-text( $bulp-child-nav-article-hover, #fff );

&::before {
-webkit-transform: scaleX( 1 );
transform: scaleX( 1 );
}
}
}

.bulp-section:nth-child(2n+1) .bulp-child-nav-item {
border-top: 0;
border-bottom: 0;
border-right: 0;
border-left-color: $bulp-child-nav-article-border;
}

}
1 change: 1 addition & 0 deletions css-dev/customizer/color-palettes/_styles-content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

&:hover,
&:focus {
background-color: darken( $button-bg, 5% );
color: $button-link-hover;
}
}
Expand Down
33 changes: 31 additions & 2 deletions css-dev/customizer/color-palettes/comm_ave.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,48 @@ $palette-id: "comm_ave";

@import "styles-base";

$current-palette: map-get( $color-palettes, $palette-id );
$current-palette: map-get( $color-palettes, $palette-id );
$color-primary: map-get( $current-palette, "color-primary" );
$color-secondary: map-get( $current-palette, "color-secondary" );
$color-tertiary: map-get( $current-palette, "color-tertiary" );
$color-dark: map-get( $current-palette, "color-dark" );

$sidebar-bg: $color-secondary;
$sidebar-link: accessible-text( $sidebar-bg, #fff );
$sidebar-link: accessible-text( $sidebar-bg, $color-grayscale-f );
$mega-toggle-bg: $color-secondary;
$sidebar-button-bg: $color-tertiary;
$bulp-category-topic-bg: darken( $color-primary, 40% );

$bulp-promo-btn-bg: #007ac1;

$bulp-largepromo-button-bg: $color-secondary;
$bulp-bu-banner-button-bg: $color-secondary;
$bulp-event-border: $color-dark;
$bulp-event-bg: lighten( $color-primary, 5% );
$bulp-event-icon-bg: $color-secondary;

$footbar-link: accessible-text( #222, #96ce53 );

$bulp-border-color: linear-gradient( to right, $color-tertiary, mix( $color-tertiary, $color-secondary, 50% ) );

$bulp-section-even-bg: $color-primary;
$bulp-section-even-color: $color-grayscale-f;

@import "triad";

@import "styles-navigation";
@import "styles-content";
@import "styles-sidebar";
@import "styles-footer";
@import "styles-bulp";

.bulp-item-button,
.bulp-article-readmore {
background: linear-gradient( to bottom right, $bulp-promo-btn-bg, mix( $bulp-promo-btn-bg, $color-secondary, 50% ) );
color: $color-grayscale-f;

&:hover {
background: linear-gradient( to bottom right, mix( $bulp-promo-btn-bg, $color-secondary, 50% ), #004e7b );
color: $color-grayscale-f;
}
}
2 changes: 1 addition & 1 deletion css-dev/customizer/color-palettes/default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $palette-id: "default";
@import "styles-base";

$button-bg: #0f69d7;
$footbar-link: accessible-text( #000, #448de7 );
$footbar-link: accessible-text( $color-grayscale-0, #448de7 );

@import "monochromatic";
@import "styles-navigation";
Expand Down
36 changes: 33 additions & 3 deletions css-dev/customizer/color-palettes/eiffel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,47 @@ $palette-id: "eiffel";
@import "styles-base";

$current-palette: map-get( $color-palettes, $palette-id );
$color-primary: map-get( $current-palette, "color-primary" );
$color-secondary: map-get( $current-palette, "color-secondary" );
$color-tertiary: map-get( $current-palette, "color-tertiary" );
$color-dark: map-get( $current-palette, "color-dark" );

$button-bg: map-get( $current-palette, "color-secondary" );
$button-link: accessible-text( $button-bg, #000, true );
$button-link-hover: accessible-text( $button-bg, #000, true );
$button-link: accessible-text( $button-bg, $color-grayscale-0, true );
$button-link-hover: accessible-text( $button-bg, $color-grayscale-0, true );

$sidebar-bg: #f4f7f7;

$content-heading: accessible-text( #fff, map-get( $current-palette, "color-tertiary" ), true );
$content-heading: accessible-text( $color-grayscale-f, $color-tertiary, true );
$bulp-promo-btn-color: map-get( $current-palette, "color-primary" );

$bulp-intro-title-bg: map-get( $current-palette, "color-primary" );
$bulp-section-even-bg: darken( $color-dark, 5% );
$bulp-child-nav-article-border: $color-primary;
$bulp-event-bg: lighten( $color-primary, 5% );
$bulp-event-color: #eef8f9;
$bulp-event-divider: #3c696f;
$bulp-category-topic-bg: $color-dark;
$bulp-category-topic-color: $color-grayscale-0;

$bulp-promo-btn-bg: #3a7e86;

@import "complimentary";

@import "styles-navigation";
@import "styles-content";
@import "styles-sidebar";
@import "styles-footer";
@import "styles-bulp";

.bulp-item-button,
.bulp-article-readmore {
background: $bulp-promo-btn-bg;
border-bottom: 3px solid $color-primary;
color: $color-grayscale-f;

&:hover {
background: lighten( $bulp-promo-btn-bg, 5% );
color: $color-grayscale-f;
}
}
20 changes: 18 additions & 2 deletions css-dev/customizer/color-palettes/extra-spectral.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,27 @@ $palette-id: "extra-spectral";

@import "styles-base";

$sidebar-bg: #a5144d;
$sidebar-button-bg: #660028;
$current-palette: map-get( $color-palettes, $palette-id );
$color-primary: map-get( $current-palette, "color-primary" );
$color-secondary: map-get( $current-palette, "color-secondary" );
$color-tertiary: map-get( $current-palette, "color-tertiary" );

$sidebar-bg: #a5144d;
$sidebar-button-bg: #660028;

$bulp-promo-btn-bg: $color-primary;
$bulp-article-btn-bg: $color-primary;
$bulp-category-topic-bg: $color-primary;
$bulp-bu-banner-button-bg: $color-secondary;
$bulp-register-btn-bg: $color-secondary;
$bulp-section-even-bg: #f3f0f4;
$bulp-child-nav-article-border: $color-tertiary;
$bulp-section-even-bg: mix( $color-primary, $color-grayscale-f, 10% );

@import "monochromatic";

@import "styles-navigation";
@import "styles-content";
@import "styles-sidebar";
@import "styles-footer";
@import "styles-bulp";
Loading

0 comments on commit a79ec99

Please sign in to comment.