Skip to content

refactor(design): remove Chakra color block #11325

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

Closed
jd wants to merge 1 commit into from
Closed

refactor(design): remove Chakra color block #11325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/Badge/Badge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
text-transform: uppercase;
letter-spacing: 0.1ch;
white-space: nowrap;
background-color: var(--chakra-colors-orange-100);
color: var(--chakra-colors-orange-800);
background-color: color-mix(in srgb, var(--color-orange-400) 25%, transparent);
color: var(--color-orange-700);
}
2 changes: 1 addition & 1 deletion src/components/DocsetGrid/Docset.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const IconComponent = !isStringIcon ? icon : null;

<style lang="scss">
.container {
border: 1px solid var(--chakra-colors-chakra-border-color);
border: 1px solid var(--theme-border);
padding: 24px;
border-radius: 6px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageContent/PageContent.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const suppressTitle = content.suppressTitle;
.divider {
opacity: 0.6;
border: 0;
border-color: var(--chakra-colors-gray-300);
border-color: var(--theme-border);
border-style: solid;
border-bottom-width: 1px;
width: 100%;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Search/Search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

.page-result {
&.active {
background: var(--chakra-colors-blue-100);
background: var(--theme-bg-offset);
}
}

Expand All @@ -45,7 +45,7 @@
}

.theme-dark .modal-content .page-result.active {
background: var(--chakra-colors-blue-700) !important;
background: var(--theme-bg-hover) !important;
}

.theme-dark .modal-content mark {
Expand Down
60 changes: 30 additions & 30 deletions src/pages/changelog/[slug].astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,19 @@ const { title, description, date, tags } = entry.data;
.date {
font-size: 1rem;
font-weight: 600;
color: var(--chakra-colors-gray-700);
color: var(--theme-text-secondary);
letter-spacing: 0.01em;
background: var(--chakra-colors-gray-100);
background: var(--theme-bg-offset);
padding: 0.5rem 1rem;
border-radius: 6px;
border: 1px solid var(--chakra-colors-gray-200);
border: 1px solid var(--theme-border);
display: inline-block;
}

.theme-dark .date {
background: var(--chakra-colors-gray-800);
color: var(--chakra-colors-gray-100);
border-color: var(--chakra-colors-gray-700);
background: var(--theme-bg-offset);
color: var(--theme-text-secondary);
border-color: var(--theme-border);
}

.tag-list {
Expand All @@ -114,21 +114,21 @@ const { title, description, date, tags } = entry.data;
}

.tag {
background: var(--chakra-colors-gray-100);
color: var(--chakra-colors-gray-700);
background: var(--theme-bg-offset);
color: var(--theme-text-secondary);
font-size: 0.75rem;
font-weight: 600;
padding: 0.4rem 0.75rem;
border-radius: 6px;
text-transform: uppercase;
letter-spacing: 0.05em;
border: 1px solid var(--chakra-colors-gray-200);
border: 1px solid var(--theme-border);
}

.theme-dark .tag {
background: var(--chakra-colors-gray-700);
color: var(--chakra-colors-gray-200);
border-color: var(--chakra-colors-gray-600);
background: var(--theme-bg-offset);
color: var(--theme-text-secondary);
border-color: var(--theme-border);
}

.entry-title {
Expand Down Expand Up @@ -242,27 +242,27 @@ const { title, description, date, tags } = entry.data;
.entry-content :global(blockquote) {
margin: 1.5rem 0;
padding: 1rem 1.25rem;
border-left: 4px solid var(--chakra-colors-gray-300);
background: var(--chakra-colors-gray-50);
border-left: 4px solid var(--theme-border);
background: var(--theme-bg-offset);
color: var(--theme-text-light);
font-style: italic;
}

.theme-dark .entry-content :global(blockquote) {
border-left-color: var(--chakra-colors-gray-600);
background: var(--chakra-colors-gray-800);
border-left-color: var(--theme-border);
background: var(--theme-bg-offset);
}

.entry-content :global(a) {
color: var(--theme-text);
text-decoration: underline;
text-decoration-color: var(--chakra-colors-gray-300);
text-decoration-color: var(--theme-border);
text-underline-offset: 2px;
transition: text-decoration-color 0.2s;
}

.entry-content :global(a:hover) {
text-decoration-color: var(--chakra-colors-gray-600);
text-decoration-color: var(--theme-text-muted);
}

.entry-content :global(hr) {
Expand Down Expand Up @@ -292,19 +292,19 @@ const { title, description, date, tags } = entry.data;
text-decoration: none;
font-size: 0.875rem;
font-weight: 600;
color: var(--chakra-colors-gray-700);
background: var(--chakra-colors-gray-100);
color: var(--theme-text-secondary);
background: var(--theme-bg-offset);
padding: 0.5rem 1rem;
border-radius: 6px;
border: 1px solid var(--chakra-colors-gray-200);
border: 1px solid var(--theme-border);
transition: all 0.2s ease;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}

.back-button:hover {
background: var(--chakra-colors-gray-700);
color: #fff;
border-color: var(--chakra-colors-gray-700);
background: var(--theme-accent);
color: var(--theme-bg-content);
border-color: var(--theme-accent);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
transform: translateY(-1px);
}
Expand All @@ -321,14 +321,14 @@ const { title, description, date, tags } = entry.data;
}

.theme-dark .back-button {
background: var(--chakra-colors-gray-700);
color: var(--chakra-colors-gray-200);
border-color: var(--chakra-colors-gray-600);
background: var(--theme-bg-offset);
color: var(--theme-text-secondary);
border-color: var(--theme-border);
}

.theme-dark .back-button:hover {
background: var(--chakra-colors-gray-600);
color: #fff;
border-color: var(--chakra-colors-gray-500);
background: var(--theme-accent);
color: var(--theme-bg-content);
border-color: var(--theme-accent);
}
</style>
44 changes: 22 additions & 22 deletions src/pages/changelog/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,18 @@ const description = 'Latest product updates from Mergify.';
text-decoration: none;
font-size: 0.875rem;
font-weight: 600;
color: var(--chakra-colors-gray-700);
background: var(--chakra-colors-gray-100);
color: var(--theme-text-secondary);
background: var(--theme-bg-offset);
padding: 0.5rem 1rem;
border-radius: 6px;
border: 1px solid var(--chakra-colors-gray-200);
border: 1px solid var(--theme-border);
transition: all 0.2s ease;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
.rss-button:hover {
background: var(--chakra-colors-gray-700);
color: #fff;
border-color: var(--chakra-colors-gray-700);
background: var(--theme-accent);
color: var(--theme-bg-content);
border-color: var(--theme-accent);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
transform: translateY(-1px);
}
Expand All @@ -310,14 +310,14 @@ const description = 'Latest product updates from Mergify.';
flex-shrink: 0;
}
.theme-dark .rss-button {
background: var(--chakra-colors-gray-700);
color: var(--chakra-colors-gray-200);
border-color: var(--chakra-colors-gray-600);
background: var(--theme-bg-offset);
color: var(--theme-text-secondary);
border-color: var(--theme-border);
}
.theme-dark .rss-button:hover {
background: var(--chakra-colors-gray-600);
color: #fff;
border-color: var(--chakra-colors-gray-500);
background: var(--theme-accent);
color: var(--theme-bg-content);
border-color: var(--theme-accent);
}

.slack-subscribe {
Expand Down Expand Up @@ -373,8 +373,8 @@ const description = 'Latest product updates from Mergify.';
display: flex;
align-items: center;
gap: 0.35rem;
background: var(--chakra-colors-gray-700);
color: #fff;
background: var(--theme-accent);
color: var(--theme-bg-content);
border: none;
padding: 0.4rem 0.75rem;
border-radius: 4px;
Expand All @@ -387,7 +387,7 @@ const description = 'Latest product updates from Mergify.';
}

.copy-btn:hover {
background: var(--chakra-colors-gray-600);
background: var(--theme-accent-secondary);
}

.copy-btn.copied {
Expand All @@ -400,9 +400,9 @@ const description = 'Latest product updates from Mergify.';

.tag-pills { display: flex; flex-wrap: wrap; gap: .65rem; }
.tag-pills-row { margin-top: 1rem; }
.pill { border: 1px solid var(--theme-border-color); background: var(--chakra-colors-gray-100); color: var(--chakra-colors-gray-700); padding: .5rem .95rem; border-radius: 999px; font-size: .85rem; font-weight: 600; cursor: pointer; line-height: 1; transition: background .15s, color .15s, border-color .15s, transform .15s; box-shadow: 0 1px 2px rgba(0,0,0,0.04); }
.pill:hover { background: var(--chakra-colors-gray-200); }
.pill.active { background: var(--chakra-colors-gray-700); color: #fff; border-color: var(--chakra-colors-gray-700); box-shadow: 0 2px 4px rgba(0,0,0,0.12); }
.pill { border: 1px solid var(--theme-border-color); background: var(--theme-bg-offset); color: var(--theme-text-secondary); padding: .5rem .95rem; border-radius: 999px; font-size: .85rem; font-weight: 600; cursor: pointer; line-height: 1; transition: background .15s, color .15s, border-color .15s, transform .15s; box-shadow: 0 1px 2px rgba(0,0,0,0.04); }
.pill:hover { background: var(--theme-bg-hover); }
.pill.active { background: var(--theme-accent); color: var(--theme-bg-content); border-color: var(--theme-accent); box-shadow: 0 2px 4px rgba(0,0,0,0.12); }
.pill:active { transform: translateY(1px); }

/* Product-specific pill colors */
Expand Down Expand Up @@ -516,7 +516,7 @@ const description = 'Latest product updates from Mergify.';
.entry-list { list-style: none; padding: 0; margin: 0; border-left: 2px solid var(--theme-border-color); }
.entry { position: relative; margin: 0; padding: 1.25rem 0 1.25rem 1.25rem; border-bottom: 1px solid var(--theme-border-color); }
.entry:last-child { border-bottom: 0; }
.entry::before { content: ''; position: absolute; left: -6px; top: 1.4rem; width: 10px; height: 10px; background: var(--chakra-colors-gray-400); border-radius: 50%; box-shadow: 0 0 0 2px var(--theme-bg); }
.entry::before { content: ''; position: absolute; left: -6px; top: 1.4rem; width: 10px; height: 10px; background: var(--theme-text-muted); border-radius: 50%; box-shadow: 0 0 0 2px var(--theme-bg); }
.entry-release::before { background: var(--section-merge-queue-accent, var(--theme-accent)); box-shadow: 0 0 0 2px var(--theme-bg), 0 0 0 6px rgba(27, 99, 243, 0.15); }
.entry-release + .entry { border-top: 1px solid var(--theme-border-color); }
.entry-release .release-title { display: inline-flex; align-items: center; gap: .4rem; font-weight: 600; font-size: 1rem; }
Expand Down Expand Up @@ -571,12 +571,12 @@ const description = 'Latest product updates from Mergify.';
}
.title { font-size: 1.05rem; margin: 0 0 .4rem; line-height: 1.3; }
.title a { text-decoration: none; color: var(--theme-text); }
.title a:hover { text-decoration: underline; color: var(--chakra-colors-gray-700); }
.title a:hover { text-decoration: underline; color: var(--theme-text-secondary); }
.summary { font-size: .85rem; margin: .1rem 0 0; color: var(--theme-text-light); line-height: 1.5; }
.more-col { align-self: center; justify-self: start; }
.read-more { display: inline-flex; align-items: center; gap: .35rem; font-size: .8rem; text-decoration: none; font-weight: 700; padding: .4rem .7rem; border-radius: .6rem; background: var(--chakra-colors-gray-100); color: var(--chakra-colors-gray-800); transition: background .15s, color .15s, transform .15s; box-shadow: 0 1px 2px rgba(0,0,0,.05); }
.read-more { display: inline-flex; align-items: center; gap: .35rem; font-size: .8rem; text-decoration: none; font-weight: 700; padding: .4rem .7rem; border-radius: .6rem; background: var(--theme-bg-offset); color: var(--theme-text); transition: background .15s, color .15s, transform .15s; box-shadow: 0 1px 2px rgba(0,0,0,.05); }
.read-more .read-icon { transition: transform .15s ease; }
.read-more:hover { background: var(--chakra-colors-gray-700); color: #fff; }
.read-more:hover { background: var(--theme-accent); color: var(--theme-bg-content); }
.read-more:hover .read-icon { transform: translateX(2px); }
@media (min-width: 50em) { .more-col { justify-self: end; } }
#no-results { text-align: center; font-size: .875rem; margin: 3rem 0; }
Expand Down
82 changes: 0 additions & 82 deletions src/styles/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,88 +205,6 @@
);
}

:root,
::backdrop {
/*
Chakra colors
*/
--chakra-colors-transparent: transparent;
--chakra-colors-current: currentColor;
--chakra-colors-black: #000000;
--chakra-colors-white: #ffffff;
--chakra-colors-whiteAlpha-50: rgba(255, 255, 255, 0.04);
--chakra-colors-whiteAlpha-100: rgba(255, 255, 255, 0.06);
--chakra-colors-whiteAlpha-200: rgba(255, 255, 255, 0.08);
--chakra-colors-whiteAlpha-300: rgba(255, 255, 255, 0.16);
--chakra-colors-whiteAlpha-400: rgba(255, 255, 255, 0.24);
--chakra-colors-whiteAlpha-500: rgba(255, 255, 255, 0.36);
--chakra-colors-whiteAlpha-600: rgba(255, 255, 255, 0.48);
--chakra-colors-whiteAlpha-700: rgba(255, 255, 255, 0.64);
--chakra-colors-whiteAlpha-800: rgba(255, 255, 255, 0.8);
--chakra-colors-whiteAlpha-900: rgba(255, 255, 255, 0.92);
--chakra-colors-blackAlpha-50: rgba(0, 0, 0, 0.04);
--chakra-colors-blackAlpha-100: rgba(0, 0, 0, 0.06);
--chakra-colors-blackAlpha-200: rgba(0, 0, 0, 0.08);
--chakra-colors-blackAlpha-300: rgba(0, 0, 0, 0.16);
--chakra-colors-blackAlpha-400: rgba(0, 0, 0, 0.24);
--chakra-colors-blackAlpha-500: rgba(0, 0, 0, 0.36);
--chakra-colors-blackAlpha-600: rgba(0, 0, 0, 0.48);
--chakra-colors-blackAlpha-700: rgba(0, 0, 0, 0.64);
--chakra-colors-blackAlpha-800: rgba(0, 0, 0, 0.8);
--chakra-colors-blackAlpha-900: rgba(0, 0, 0, 0.92);
--chakra-colors-gray-50: #f7fafc;
--chakra-colors-gray-100: #edf2f7;
--chakra-colors-gray-200: #e2e8f0;
--chakra-colors-gray-300: #cbd5e0;
--chakra-colors-gray-400: #a0aec0;
--chakra-colors-gray-500: #718096;
--chakra-colors-gray-600: #4a5568;
--chakra-colors-gray-700: #2d3748;
--chakra-colors-gray-800: #1a202c;
--chakra-colors-gray-900: #171923;
--chakra-colors-red-50: #fff5f5;
--chakra-colors-red-100: #fed7d7;
--chakra-colors-red-200: #feb2b2;
--chakra-colors-red-300: #fc8181;
--chakra-colors-red-400: #f56565;
--chakra-colors-red-500: #e53e3e;
--chakra-colors-red-600: #c53030;
--chakra-colors-red-700: #9b2c2c;
--chakra-colors-red-800: #822727;
--chakra-colors-red-900: #63171b;
--chakra-colors-orange-50: #fffaf0;
--chakra-colors-orange-100: #feebc8;
--chakra-colors-orange-200: #fbd38d;
--chakra-colors-orange-300: #f6ad55;
--chakra-colors-orange-400: #ed8936;
--chakra-colors-orange-500: #dd6b20;
--chakra-colors-orange-600: #c05621;
--chakra-colors-orange-700: #9c4221;
--chakra-colors-orange-800: #7b341e;
--chakra-colors-orange-900: #652b19;
--chakra-colors-green-50: #f0fff4;
--chakra-colors-green-100: #c6f6d5;
--chakra-colors-green-200: #9ae6b4;
--chakra-colors-green-300: #68d391;
--chakra-colors-green-400: #48bb78;
--chakra-colors-green-500: #38a169;
--chakra-colors-green-600: #2f855a;
--chakra-colors-green-700: #276749;
--chakra-colors-green-800: #22543d;
--chakra-colors-green-900: #1c4532;
--chakra-colors-blue-50: #ddeef8;
--chakra-colors-blue-100: #badff3;
--chakra-colors-blue-200: #98ccec;
--chakra-colors-blue-300: #75bce6;
--chakra-colors-blue-400: #54ace0;
--chakra-colors-blue-500: #1f79ac;
--chakra-colors-blue-600: #196189;
--chakra-colors-blue-700: #144767;
--chakra-colors-blue-800: #0a2534;
--chakra-colors-blue-900: #000000;
--chakra-colors-chakra-border-color: var(--chakra-colors-gray-200);
}

:root.theme-dark,
.theme-dark ::backdrop {
color-scheme: dark;
Expand Down
Loading