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

Jump to bottom

fix: add border to inner cards and panels #1996

Merged
merged 4 commits into from
Oct 18, 2024
Merged

fix: add border to inner cards and panels #1996

merged 4 commits into from
Oct 18, 2024

Conversation

QuintonJason
Copy link
Contributor

@QuintonJason QuintonJason commented Oct 4, 2024 •
edited
Loading

Description

  • add border back to cards and panels within cards / panels

Screenshots

Before After
Screenshot 2024-10-16 at 10 20 49 AM Screenshot 2024-10-16 at 10 21 03 AM

Testing in sage-lib

  • test in kp with the bridge on

Testing in kajabi-products

  1. (MEDIUM) add border back to cards and panels within cards / panels
    • People Full Contact page -> Life Cycle section

Related

DSS-1066

@QuintonJason QuintonJason added the mercury-rising Used for rebrand work label Oct 4, 2024
@QuintonJason QuintonJason self-assigned this Oct 4, 2024
@ju-Skinner ju-Skinner force-pushed the mercury-rising branch 3 times, most recently from 49bee6f to 35b005f Compare October 8, 2024 15:03
@ju-Skinner ju-Skinner added the WIP label Oct 10, 2024
@QuintonJason QuintonJason changed the base branch from mercury-rising to develop October 16, 2024 14:48
@QuintonJason QuintonJason force-pushed the fix/add-border-to-inner-cards-and-panels-1 branch from a6f4f38 to 0467667 Compare October 16, 2024 15:15
@QuintonJason QuintonJason marked this pull request as ready for review October 16, 2024 15:23
@QuintonJason QuintonJason requested a review from a team October 16, 2024 15:23
@QuintonJason QuintonJason removed the mercury-rising Used for rebrand work label Oct 16, 2024
@anechol anechol requested a review from a team October 16, 2024 15:25
@ju-Skinner
Copy link
Collaborator

When you tested with the bridge on, did you check that there weren't any "shims" that already had borders?

kajabi-bot and others added 4 commits October 18, 2024 12:02
@kajabi-bot @QuintonJason
feat!(rebrand): mercury-rising rebrand effort
8f91284 
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 <dev+github-bot@kajabi.com>

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 <dev+github-bot@kajabi.com>

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 <dev+github-bot@kajabi.com>

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

Co-authored-by: Julian Skinner <dev+github-bot@kajabi.com>

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 <dev+github-bot@kajabi.com>

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 <dev+github-bot@kajabi.com>

style: updates button font family

style: add Faire Spring font family (#1980)

Co-authored-by: Julian Skinner <dev+github-bot@kajabi.com>

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

Co-authored-by: Julian Skinner <dev+github-bot@kajabi.com>

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

Co-authored-by: Julian Skinner <dev+github-bot@kajabi.com>
@QuintonJason @kajabi-bot
style: update color token name 3 digits (#1955)
ed8031a 
* fix(frame): add box shadow to bordered frame (#1958)

* 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

* fix: change legacy colors to mapped values ie red 500 to red 95

* fix: remove old 100 tokens

* fix: add 0 to make token 3 digits

* fix: add red color classes

* fix: add 0 to green color token names

* fix: add 0 to blue color token names

* fix: add 0 to mercury color token names

* fix: add 0 to yellow color token names

* fix: add 0 to purple color token names

* fix: update grey color token names to 3 digits

* fix: update react green colors

* fix: update react purple colors

* fix: update red in jsx and erb

* fix: update orange color token to mercury

* fix: update charcoal color token to upper greys

* fix: update grey color token to lower greys

* fix: add options for default color values

* chore: remove whitespace

* fix: self review fix grey 300 and grey 400 in css

* Revert "fix: self review fix grey 300 and grey 400 in css"

This reverts commit 2ae5967.

* Revert "fix: update grey color token to lower greys"

This reverts commit 69f8706.

* fix: update grey color token to lower greys

* Revert "fix: update grey color token to lower greys"

This reverts commit 2f43f1d.

* style: update purple color token to use three digits

* style: update additional 2 digit token value to 3 digit token values

* style: added zero to mercury 30

* style: update templating to wrap 050 values in single-quotes

* style(breadcrumbs): change charcoal 400 to grey 900

* fix: update gray to grey instances

---------

Co-authored-by: Julian Skinner <dev+github-bot@kajabi.com>
@QuintonJason
fix: add-border-to-inner-cards-and-panels
4a36dc2
@QuintonJason
fix: clean up after rebase
f481719
@QuintonJason QuintonJason force-pushed the fix/add-border-to-inner-cards-and-panels-1 branch from 73584d2 to f481719 Compare October 18, 2024 17:02
@QuintonJason
Copy link
Contributor Author

When you tested with the bridge on, did you check that there weren't any "shims" that already had borders?

@ju-Skinner Yes, and we can remove those known one on the kp PR

@QuintonJason
Copy link
Contributor Author

Requires a kp follow up on the update PR to remove the border from .dashboard-stat-card .stat-card

@QuintonJason QuintonJason merged commit 36c50d9 into develop Oct 18, 2024
7 checks passed
@QuintonJason QuintonJason deleted the fix/add-border-to-inner-cards-and-panels-1 branch October 18, 2024 19:01
@QuintonJason QuintonJason mentioned this pull request Oct 18, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@monicawheeler monicawheeler monicawheeler approved these changes

@anechol anechol anechol approved these changes

@ju-Skinner ju-Skinner ju-Skinner approved these changes

Assignees

@QuintonJason QuintonJason

Labels
WIP
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@QuintonJason @ju-Skinner @anechol @monicawheeler @kajabi-bot