Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(webapp): changed color for event-ribbon. #6362

Merged
merged 8 commits into from
Jun 5, 2023
Merged

refactor(webapp): changed color for event-ribbon. #6362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a08d4f4
refactor(webapp): changed color for event-ribbon.
entermex Jun 1, 2023
75f18e6
refactor(webapp): changed locaalized text for article ribbon.
entermex Jun 1, 2023
9c98f87
refactor(webapp): changed color a bit litter for event-ribbons
entermex Jun 2, 2023
166941f
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-o…
Elweyn Jun 2, 2023
1626b06
Revert "refactor(webapp): changed locaalized text for article ribbon."
Elweyn Jun 5, 2023
93a679c
Add background color definitions
Elweyn Jun 5, 2023
277e53d
Change ribbon text from 'post' to 'article'
Elweyn Jun 5, 2023
8a10c95
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-o…
mahula Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions webapp/assets/_new/styles/tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ $background-color-primary-inverse: rgb(241, 253, 244);
$background-color-secondary: rgb(0, 142, 230);
$background-color-secondary-active: rgb(10, 161, 255);
$background-color-secondary-inverse: rgb(240, 249, 255);
$background-color-third: rgb(126, 82, 204);
$background-color-third-active: rgb(160, 103, 255);
$background-color-third-inverse: rgb(239, 230, 255);
$background-color-success: rgb(23, 181, 63);
$background-color-success-active: rgb(26, 203, 71);
$background-color-success-inverse: rgb(241, 253, 244);
Expand Down Expand Up @@ -395,3 +398,12 @@ $color-toast-orange: $color-warning;
$color-toast-yellow: $color-yellow;
$color-toast-blue: $color-secondary;
$color-toast-green: $color-success;

/**
* @tokens Ribbon Color
*/

$color-ribbon-event: $background-color-third;
$color-ribbon-event-active: $background-color-third-active;
$color-ribbon-article: $background-color-secondary;
$color-ribbon-article-active: $background-color-secondary-active;
8 changes: 4 additions & 4 deletions webapp/components/Ribbon/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
padding: $size-ribbon $size-ribbon;
border-radius: $border-radius-small 0 0 $border-radius-small;
color: $color-neutral-100;
background-color: $background-color-secondary-active;
background-color: $color-ribbon-article-active;
font-size: $font-size-x-small;
font-weight: $font-weight-bold;

Expand All @@ -36,7 +36,7 @@ export default {
bottom: -$size-ribbon;
border-width: $border-size-large 4px $border-size-large $border-size-large;
border-style: solid;
border-color: $background-color-secondary transparent transparent $background-color-secondary;
border-color: $color-ribbon-article transparent transparent $color-ribbon-article;
}

&.--pinned {
Expand All @@ -48,10 +48,10 @@ export default {
}
}
.eventBg {
background-color: $color-success-active;
background-color: $color-ribbon-event-active;

&::before {
border-color: $color-success-active transparent transparent $color-success-active;
border-color: $color-ribbon-event transparent transparent $color-ribbon-event;
}
}
</style>
2 changes: 1 addition & 1 deletion webapp/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@
"unpin": "Unpin post",
"unpinnedSuccessfully": "Post unpinned successfully!"
},
"name": "Post",
"name": "Article",
"pinned": "Announcement",
"takeAction": {
"name": "Take action"
Expand Down