Skip to content

Commit

Permalink
feat(tags): assign link color to tag if href present -refs #263347 (#435
Browse files Browse the repository at this point in the history
)

* fix: assign link color to tag -refs #263347

* fix: assign link color to tag variable -refs #263347

* fix: modify css for tags with links -refs #263347

* fix(tests): upgrade to cypress 13 and fix integration test -refs #263347
  • Loading branch information
ana-oprea authored May 7, 2024
1 parent 89b4c9b commit 3fe619b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
4 changes: 0 additions & 4 deletions cypress/support/e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ export const slateBeforeEach = (contentType = 'Document') => {
path: 'cypress',
});
cy.visit('/cypress/my-page');
cy.waitForResourceToLoad('@navigation');
cy.waitForResourceToLoad('@breadcrumbs');
cy.waitForResourceToLoad('@actions');
cy.waitForResourceToLoad('@types');
cy.waitForResourceToLoad('my-page');
cy.navigate('/cypress/my-page/edit');
};
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"slick-carousel": "^1.8.1"
},
"devDependencies": {
"cypress": "13.1.0",
"@cypress/code-coverage": "^3.10.0",
"@plone/scripts": "*",
"babel-plugin-transform-class-properties": "^6.24.1",
Expand Down
13 changes: 12 additions & 1 deletion theme/themes/eea/extras/tag.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*******************************/

.tag {
cursor: pointer;
display: inline-flex;
align-items: center;
justify-content: center;
Expand All @@ -21,6 +20,18 @@
font-weight: @tagNameFontWeight;
line-height: @tagNameLineHeight;

&.link {
.icon,
.name {
color: @tagLinkFontColor;
cursor: pointer;

&:visited {
color: @tagLinkFontColor;
}
}
}

.icon {
width: unset;
height: unset;
Expand Down
1 change: 1 addition & 0 deletions theme/themes/eea/extras/tag.variables
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@tagPadding : @mediumGap 0;
@tagHeight : 1.25rem;
@tagMargin : 0 0 0 0;
@tagLinkFontColor : var(--text-color, @linkColor);

/* Tag Icon */
@tagHashtagFontSize : 0.75rem;
Expand Down

0 comments on commit 3fe619b

Please sign in to comment.