-
Notifications
You must be signed in to change notification settings - Fork 10.9k
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.
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
feat: Workspace/subscription ux #34057
base: develop
Are you sure you want to change the base?
Conversation
The WorkspaceCardSection component was updated to improve typography and clarify title differentiation. The header titles now use the h4 font scale, while the section titles have been updated to use the p2b font scale. Additionally, the default font scale of the component text was changed to p2. A new boolean property was also added to differentiate between header titles and section titles, ensuring consistent styling and clearer hierarchy.
…rtically and horizontally
Looks like this PR is ready to merge! 🎉 |
🦋 Changeset detectedLatest commit: 4ecaddd The changes in this PR will be included in the next version bump. This PR includes changesets to release 35 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #34057 +/- ##
========================================
Coverage 75.81% 75.81%
========================================
Files 512 512
Lines 22208 22208
Branches 5404 5404
========================================
Hits 16837 16837
Misses 4720 4720
Partials 651 651
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardCommunity.tsx
Show resolved
Hide resolved
apps/meteor/client/views/admin/workspace/components/WorkspaceCardSection.tsx
Outdated
Show resolved
Hide resolved
Componentized the WorkspaceCardSection title and refactored the WorkspaceCardSectionTitle to accept the new title.
The version card background image has been updated to better align with design specifications. On large screens and smaller, the image is fixed to the right side of the container and gradually crops from the right as the container shrinks. On extra-large screens and larger, it remains fixed to the right side with a 20px margin from the container's edge.
if reflects in ui/ux changes is not a refactor, also requires changeset |
apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
Outdated
Show resolved
Hide resolved
…tChat/Rocket.Chat into refactor/workspace-subscription-ux
apps/meteor/client/views/admin/subscription/components/FeatureUsageCard.tsx
Outdated
Show resolved
Hide resolved
apps/meteor/client/views/admin/subscription/components/cards/ActiveSessionsCard.tsx
Outdated
Show resolved
Hide resolved
apps/meteor/client/views/admin/subscription/components/cards/ActiveSessionsPeakCard.tsx
Outdated
Show resolved
Hide resolved
apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx
Outdated
Show resolved
Hide resolved
apps/meteor/client/views/admin/workspace/UsersUploadsCard/UsersUploadsCard.tsx
Outdated
Show resolved
Hide resolved
apps/meteor/client/views/admin/workspace/components/WorkspaceCardSectionTitle.tsx
Outdated
Show resolved
Hide resolved
just a reminder: if it changes something to the end user it shouldn't be a chore |
Removed the titleToContentGap prop as the margin-block-end of all h4 titles are 20px anyways so this can be done with a simple ternary.
Proposed changes (including videos or screenshots)
p2
, the fontScale of the WorkspaceCardSection title top2b
and the fontScale of the WorkspaceCardSection header titles toh4
;vertically
andhorizontally
;horizontally
;244px
to the cards and changed the margin between the community card content to be8px
;Demos:
Workspace page:
FontScale and spacing changes
Change responsivity strategy
Subscription page:
Centralize content vertically and horizontally
Change spacing for community card and apps card. Add 244px "min-height" to all the cards
Centralize content horizontally
Issue(s)
Steps to test or reproduce
Further comments
Jira tasks:
CONN-413: Workspace font size
CONN-414: Version card background image responsivity
CONN-415: Centralize seats and MAC
CONN-417: Subscription page spacing
CONN-418: Centralize active sessions and active sessions peak