Skip to content

Commit

Permalink
feat!(rebrand): mercury-rising rebrand effort
Browse files Browse the repository at this point in the history 
ci: update rebrand mercury workflow for deployments

revert(font-weight): combine font-weights back to *00 based

fix: DSS-752

style(letter-spacing): updates to letter spacing for medium and smaller (#1922)

fix: DSS-747

Co-authored-by: Julian Skinner <[email protected]>

style: update body-xs to 12px (#1926)

refactor: removes page scope empty state and updates styles

style: adds styles for Icon Card for default and compact variants

style: adds gradient to icon card and empty state

docs: removes unneeded examples and adds new props

refactor: removes gradient

refactor: renames scope prop to size

chore: fixes Story name

refactor: adds background color to icon

docs: updates Empty States docs pages for Rails and React

docs: updates React component description with better clarity

chore: fixes linting issues

chore: removes unneeded gradient references

style(alert): adjust small variant icon alignment (#1930)

style(checkbox): adjust checkbox margin for alignment (#1931)

style(dropdown): add display flex to dropdown trigger (#1934)

* style(dropdown): add display flex to dropdown trigger

* style(dropdown): reorder css property

style(badge): correct interactive icon size (#1935)

style(line-height): update line-height to have rem units (#1933)

fix(p): remove adjacent p tag spacing (#1936)

fix: add white background color to box-like elements

* fix(box-shadow): update box shadow token value

* fix(box like components): add white background and md box shadow

* fix(container): remove color and shadow from container

* fix(css): updated order

* fix(frame): update to fix background color with nested frames

* fix(frame): add white background to bordered variant

chore: adds scope prop to address spec failures

chore: fixes syntax error

fix: add panel box-shadow (#1944)

* fix: add box-shadow to panel

* fix: remove box-shadow from inner card and panels

fix: updates placeholder assets & styles (#1947)

* fix: add new image assets

* style: adjust page heading image bg color

* fix: add new image assets for storybook

* fix: convert unsplash images to placeholders

* fix: convert unsplash images to small placeholder

* fix: hello linter my old friend

* fix: update image in empty state

fix: update line-height tokens (#1951)

fix: update box shadows (#1952)

* fix: update box shadows

* fix: add space after comma

ci: revert rebrand-mercury-rising back to original workflow

this is done since release-deploy has been fixed.

We hopes this solves this branch from not deploying properly in staging

style(pagination): remove background color (#1956)

style(choice): correct icon alignment (#1957)

* style(choice): remove incorrect margin styles

* docs(choice): add additional example without subtext

fix(sortable): update template columns (#1960)

fix(frame): add box shadow to bordered frame (#1958)

style(tab): adjust tab underline variable value (#1959)

chore: update pine-ds/icons to latets version

fix: updates conditionals to make image optional (#1965)

style: remove border from box like elements with box shadows (#1967)

* style: add shadow to frame

* style: remove border from box-like elements

* chore: remove white space for linter

style: change the active tab color to mercury 50 (#1969)

Co-authored-by: Julian Skinner <[email protected]>

style: focus state updates (#1970)

* style: update sage-focus-ring mixin

* style: update focus-outline colors

* fix: removes duplicate focus ring

* style: update focus colors and sizing

* style: adjust tab focus

* fix: replace named color for linter

style(alert): add borders (#1972)

style(progress): update the default fill color to mercury-50 (#1971)

Co-authored-by: Julian Skinner <[email protected]>

style(button): change border radius to 9999px (#1973)

Co-authored-by: Julian Skinner <[email protected]>

style: update spacer to use logical properties (#1968)

style(button): change the colors for the accent variant to be purple (#1974)

Co-authored-by: Julian Skinner <[email protected]>

feature(loader): change loader to new behavior and colors (#1975)

* feat(loader-rails): change the loader animation and fill color

* feat(loader-react): change the loader animation and fill color

* style(loader): change timing to 1.5s per convo with design team

---------

Co-authored-by: Julian Skinner <[email protected]>

style: updates button font family

style: add Faire Spring font family (#1980)

Co-authored-by: Julian Skinner <[email protected]>

style(button): change button font-weight to med (500) (#1984)

Co-authored-by: Julian Skinner <[email protected]>

fix(button): loading button wasn't animating, updated svg in button-spinner.js (#1987)

Co-authored-by: Julian Skinner <[email protected]>
  • Loading branch information
@kajabi-bot @QuintonJason
kajabi-bot authored and QuintonJason committed Oct 16, 2024
1 parent b702935 commit 0c16340
Show file tree
Hide file tree
Showing 6 changed files with 1,167 additions and 2 deletions.
240 changes: 240 additions & 0 deletions docs/lib/sage_rails/app/sage_tokens/sage_dictionary.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,66 @@ module SageDictionary
},
},
"YELLOW": {
"5": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_5_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_5_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_5_CLASSNAME,
},
"10": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_10_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_10_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_10_CLASSNAME,
},
"15": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_15_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_15_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_15_CLASSNAME,
},
"20": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_20_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_20_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_20_CLASSNAME,
},
"30": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_30_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_30_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_30_CLASSNAME,
},
"40": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_40_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_40_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_40_CLASSNAME,
},
"50": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_50_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_50_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_50_CLASSNAME,
},
"60": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_60_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_60_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_60_CLASSNAME,
},
"70": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_70_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_70_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_70_CLASSNAME,
},
"80": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_80_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_80_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_80_CLASSNAME,
},
"90": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_90_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_90_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_90_CLASSNAME,
},
"95": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_95_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_95_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_YELLOW_95_CLASSNAME,
},
"100": {
"HEX": SD_SAGE_COLOR_BASE_YELLOW_100_HEX,
"CODE": SD_SAGE_COLOR_BASE_YELLOW_100_CODE,
Expand Down Expand Up @@ -671,6 +731,66 @@ module SageDictionary
},
},
"RED": {
"5": {
"HEX": SD_SAGE_COLOR_BASE_RED_5_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_5_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_5_CLASSNAME,
},
"10": {
"HEX": SD_SAGE_COLOR_BASE_RED_10_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_10_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_10_CLASSNAME,
},
"15": {
"HEX": SD_SAGE_COLOR_BASE_RED_15_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_15_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_15_CLASSNAME,
},
"20": {
"HEX": SD_SAGE_COLOR_BASE_RED_20_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_20_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_20_CLASSNAME,
},
"30": {
"HEX": SD_SAGE_COLOR_BASE_RED_30_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_30_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_30_CLASSNAME,
},
"40": {
"HEX": SD_SAGE_COLOR_BASE_RED_40_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_40_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_40_CLASSNAME,
},
"50": {
"HEX": SD_SAGE_COLOR_BASE_RED_50_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_50_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_50_CLASSNAME,
},
"60": {
"HEX": SD_SAGE_COLOR_BASE_RED_60_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_60_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_60_CLASSNAME,
},
"70": {
"HEX": SD_SAGE_COLOR_BASE_RED_70_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_70_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_70_CLASSNAME,
},
"80": {
"HEX": SD_SAGE_COLOR_BASE_RED_80_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_80_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_80_CLASSNAME,
},
"90": {
"HEX": SD_SAGE_COLOR_BASE_RED_90_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_90_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_90_CLASSNAME,
},
"95": {
"HEX": SD_SAGE_COLOR_BASE_RED_95_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_95_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_RED_95_CLASSNAME,
},
"100": {
"HEX": SD_SAGE_COLOR_BASE_RED_100_HEX,
"CODE": SD_SAGE_COLOR_BASE_RED_100_CODE,
Expand Down Expand Up @@ -760,6 +880,66 @@ module SageDictionary
},
},
"PURPLE": {
"5": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_5_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_5_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_5_CLASSNAME,
},
"10": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_10_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_10_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_10_CLASSNAME,
},
"15": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_15_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_15_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_15_CLASSNAME,
},
"20": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_20_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_20_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_20_CLASSNAME,
},
"30": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_30_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_30_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_30_CLASSNAME,
},
"40": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_40_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_40_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_40_CLASSNAME,
},
"50": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_50_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_50_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_50_CLASSNAME,
},
"60": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_60_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_60_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_60_CLASSNAME,
},
"70": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_70_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_70_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_70_CLASSNAME,
},
"80": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_80_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_80_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_80_CLASSNAME,
},
"90": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_90_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_90_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_90_CLASSNAME,
},
"95": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_95_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_95_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_PURPLE_95_CLASSNAME,
},
"100": {
"HEX": SD_SAGE_COLOR_BASE_PURPLE_100_HEX,
"CODE": SD_SAGE_COLOR_BASE_PURPLE_100_CODE,
Expand Down Expand Up @@ -849,6 +1029,66 @@ module SageDictionary
},
},
"GREY": {
"5": {
"HEX": SD_SAGE_COLOR_BASE_GREY_5_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_5_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_5_CLASSNAME,
},
"10": {
"HEX": SD_SAGE_COLOR_BASE_GREY_10_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_10_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_10_CLASSNAME,
},
"15": {
"HEX": SD_SAGE_COLOR_BASE_GREY_15_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_15_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_15_CLASSNAME,
},
"20": {
"HEX": SD_SAGE_COLOR_BASE_GREY_20_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_20_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_20_CLASSNAME,
},
"30": {
"HEX": SD_SAGE_COLOR_BASE_GREY_30_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_30_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_30_CLASSNAME,
},
"40": {
"HEX": SD_SAGE_COLOR_BASE_GREY_40_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_40_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_40_CLASSNAME,
},
"50": {
"HEX": SD_SAGE_COLOR_BASE_GREY_50_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_50_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_50_CLASSNAME,
},
"60": {
"HEX": SD_SAGE_COLOR_BASE_GREY_60_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_60_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_60_CLASSNAME,
},
"70": {
"HEX": SD_SAGE_COLOR_BASE_GREY_70_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_70_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_70_CLASSNAME,
},
"80": {
"HEX": SD_SAGE_COLOR_BASE_GREY_80_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_80_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_80_CLASSNAME,
},
"90": {
"HEX": SD_SAGE_COLOR_BASE_GREY_90_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_90_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_90_CLASSNAME,
},
"95": {
"HEX": SD_SAGE_COLOR_BASE_GREY_95_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_95_CODE,
"CLASSNAME": SD_SAGE_COLOR_BASE_GREY_95_CLASSNAME,
},
"100": {
"HEX": SD_SAGE_COLOR_BASE_GREY_100_HEX,
"CODE": SD_SAGE_COLOR_BASE_GREY_100_CODE,
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"conventionalCommits": true,
"message": "chore(release): publish [skip ci]",
"registry": "https://npm.pkg.github.com",
"allowBranch": ["main", "develop"]
"allowBranch": ["main", "develop", "mercury-rising"]
}
}
}
13 changes: 13 additions & 0 deletions packages/sage-assets/lib/stylesheets/components/_alert.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ $-alert-border-colors: (
danger: sage-color(red, 300),
);

$-alert-border-colors: (
default: sage-color(grey, 30),
draft: sage-color(grey, 30),
info: sage-color(blue, 30),
published: sage-color(green, 30),
success: sage-color(green, 30),
warning: sage-color(yellow, 30),
approaching: sage-color(yellow, 30),
reached: sage-color(mercury, 30),
exceeded: sage-color(red, 30),
danger: sage-color(red, 30),
);

.sage-alert {
display: grid;
grid-template-columns: auto 1fr;
Expand Down
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/components/_page_heading.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ $-page-heading-image-height-mobile: rem(120px);
grid-area: image;
overflow: hidden;
min-height: $-page-heading-image-height-min;
background: sage-color(grey, 300);
background: sage-color(grey, 30);
border-radius: sage-border(radius);
border: sage-border();

Expand Down
Loading

0 comments on commit 0c16340

Please sign in to comment.