Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into patternlab/DP-19336-offscr…
Browse files Browse the repository at this point in the history
…een-menu-fixes
  • Loading branch information
tom-fleming committed Jul 30, 2020
2 parents 220589a + 1547fd3 commit 60d5ebf
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Mayflower Release Notes
All notable changes to this project will be documented in this file.

## 9.53.0 (7/6/2020)
### Changed
- (Patternlab) [Print] DP-18951: Feedback related markup removed from print styles.

## 9.52.1 (6/22/2020)
### Changed
- (Patternlab) [RelationsipIndicator] DP-17150: Change the label of the secondary set. Change the width of each set. Adjust spacing.
Expand Down
14 changes: 13 additions & 1 deletion assets/scss/02-molecules/_relationship-indicators.scss
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
&.secondary {
width: 100%;
min-width: 40%;
padding-top: 8px;//15px;
padding-top: 8px;

@media ($bp-large-min) {
padding-top: 0;
Expand Down Expand Up @@ -235,6 +235,18 @@
transform: translateY(-55%) rotate(-135deg);
}
}

&.single {

a {
color: $c-primary-alt;
box-shadow: inset 0 0 white, inset 0px -1px rgba($c-primary-alt, 0.4);

&:hover {
box-shadow: inset 0 0 white, inset 0px -2px rgba($c-primary-alt, 0.7);
}
}
}
}

&--terms {
Expand Down
1 change: 1 addition & 0 deletions assets/scss/08-print/_print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
.ma__footer,
.ma__fixed-feedback-button,
.post-content #feedback,
.post-content .feedback-steps,
.messages--error,
*[aria-hidden="true"],
.ma__download-link__icon,
Expand Down
12 changes: 12 additions & 0 deletions changelogs/DP-19187.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Added:
- project: Patternlab
component: RelationshopIndicator
description: Set up styles for relationship indicator .single component links. (#1130)
issue: DP-19187
impact: Patch
Fixed:
- project: Patternlab
component: RelationshopIndicator
description: Correct the sample for relationship indicator .single component. (#1130)
issue: DP-19187
impact: Patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
{
"relationshipIndicators": {
"primary": {
"position": "primary",
"pageTitle": "Unemployment Benefits",
"primary": {},
"secondary": {
"position": "single",
"label": "offered by",
"tags": [{
"class": "ma__relationship-indicators--term",
"class": "",
"href": "#",
"title": "Department of Conservation and Recreation"
},{
"class": "ma__relationship-indicators--term",
"class": "",
"href": "#",
"title": "Other agency or organization"
}]
}
}
}
}

0 comments on commit 60d5ebf

Please sign in to comment.