Skip to content

feat: add redesigned organization settings sidebar #15932

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

Merged
merged 38 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b9ff0fa
wip
jaaydenh Oct 2, 2024
aab755d
fix
jaaydenh Oct 15, 2024
85ee8a2
wip
jaaydenh Oct 16, 2024
e556af9
revert css
jaaydenh Oct 16, 2024
4904c03
feat: changes for premium page
jaaydenh Oct 30, 2024
e99c314
feat: implement Premium page with Tailwind and shadcn button
jaaydenh Nov 1, 2024
c5696cc
chore: updates to button styles
jaaydenh Nov 1, 2024
8f295b0
chore: update variant
jaaydenh Nov 1, 2024
1474b5e
chore: move CacheProvider to ThemeProvider
jaaydenh Nov 1, 2024
1db3f36
chore: update paths for shadcn
jaaydenh Nov 1, 2024
cc0a52f
feat: show premium tab if no premium license
jaaydenh Nov 3, 2024
65f980b
fix: fix format
jaaydenh Nov 3, 2024
1388f77
fix: remove fontSize
jaaydenh Nov 5, 2024
377c711
feat: initial commit to setup redesign orgs sidebar
jaaydenh Dec 18, 2024
92d35ce
fix: remove margin left
jaaydenh Dec 18, 2024
e5cb90d
fix: e2e test fixes
jaaydenh Dec 19, 2024
8ada640
chore: improve styles
jaaydenh Dec 19, 2024
6a1bf43
chore: cleanup OrganizationSidebar
jaaydenh Dec 19, 2024
d626c6d
chore: updates to create organization page
jaaydenh Dec 20, 2024
7581c4e
fix: fix test
jaaydenh Jan 2, 2025
ea58488
fix: format
jaaydenh Jan 2, 2025
4c7a5c9
chore: if only one org, don't show in dropdown
jaaydenh Jan 2, 2025
4361c5c
chore: update for mobile
jaaydenh Jan 3, 2025
7d6974d
fix: remove link for organization breadcrumb
jaaydenh Jan 3, 2025
d052c40
feat: improve design of create organization page
jaaydenh Jan 3, 2025
51d84e2
feat: truncate long organization names
jaaydenh Jan 3, 2025
b6f9e4d
chore: update styling for premium banner
jaaydenh Jan 3, 2025
afe7b50
fix: handle display of more than 6 orgs
jaaydenh Jan 3, 2025
b0d7c4a
feat: add story
jaaydenh Jan 3, 2025
e2dbc31
fix: improve outline display
jaaydenh Jan 3, 2025
35788c0
fix: do not wrap command item with link
jaaydenh Jan 4, 2025
5d423d9
chore: cleanup
jaaydenh Jan 4, 2025
77f70b9
fix: replace create org button with command item
jaaydenh Jan 4, 2025
43690ad
fix: do not highlight background on selected
jaaydenh Jan 7, 2025
14ba63f
fix: ensure the popover closes when navigating to a new page
jaaydenh Jan 8, 2025
f029bb4
chore: cleanup
jaaydenh Jan 8, 2025
ab15e75
fix: format
jaaydenh Jan 8, 2025
b66bb79
fix: test
jaaydenh Jan 8, 2025
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
Prev Previous commit
Next Next commit
feat: implement Premium page with Tailwind and shadcn button
  • Loading branch information
jaaydenh committed Jan 8, 2025
commit e99c314e6da394f6f7f73b386f0229cd1ea264c0
6 changes: 3 additions & 3 deletions site/src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { clsx, type ClassValue } from "clsx"
import { twMerge } from "tailwind-merge"
import { type ClassValue, clsx } from "clsx";
import { twMerge } from "tailwind-merge";

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
return twMerge(clsx(inputs));
}
2 changes: 2 additions & 0 deletions site/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const colors = require("tailwindcss/colors");

/** @type {import('tailwindcss').Config} */
module.exports = {
corePlugins: {
Expand Down