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

feat: flip goku and gohan. Fix all components and docs [MDS-688] #2379

Merged
merged 11 commits into from
Oct 3, 2023
Merged

feat: flip goku and gohan. Fix all components and docs [MDS-688] #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca4bb04
feat: flip goku and gohan. Fix Accordion, Popover, Tabs, Search, Sear…
dkireev Sep 20, 2023
f84283c
Merge branch 'develop' of github.com:coingaming/moon-design into MDS-688
dkireev Sep 21, 2023
3766357
feat: swap goku/gohan in Alert, Avatar, AuthCode, BottomSheet [MDS-688]
dkireev Sep 21, 2023
1c0296d
feat: swap goku/gohan in Alert, Avatar, AuthCode, BottomSheet [MDS-688]
dkireev Sep 21, 2023
672b2d1
Merge branch 'develop' of github.com:coingaming/moon-design into MDS-688
dkireev Sep 22, 2023
4c3e7ad
feat: swap goku/gohan in all components [MDS-688]
dkireev Sep 22, 2023
9b94e93
Merge branch 'develop' of github.com:coingaming/moon-design into MDS-688
dkireev Sep 22, 2023
bafb25f
Merge branch 'develop' of github.com:coingaming/moon-design into MDS-688
dkireev Sep 22, 2023
75fb7e2
fix: Button and IconButton docs
dkireev Sep 22, 2023
4e5b103
fix: merge develop
dkireev Sep 27, 2023
6d20417
fix: merge develop
dkireev Oct 2, 2023
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
2 changes: 1 addition & 1 deletion next-docs/components/ComponentAnatomy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const ComponentAnatomy: React.FC<{ children?: React.ReactNode }> = ({
children,
}) => (
<PageSection title="Anatomy">
<pre className="flex w-full p-4 bg-goku rounded-moon-s-sm overflow-scroll text-moon-14 text-bulma">
<pre className="flex w-full p-4 bg-gohan rounded-moon-s-sm overflow-scroll text-moon-14 text-bulma">
{children}
</pre>
</PageSection>
Expand Down
4 changes: 2 additions & 2 deletions next-docs/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const Layout = ({ children, title }: Props) => {
<Head>
<title>{title ? `${SITE_TITLE} | ${title}` : SITE_TITLE}</title>
</Head>
<div className="layout bg-goku text-bulma flex">
<div className="layout bg-gohan text-bulma flex">
{/* Dynamic sidebar with transition for mobile */}
<Drawer open={isSidebarOpen} setOpen={setSidebarOpen}>
<Drawer.Panel position="start" className="w-80">
Expand All @@ -34,7 +34,7 @@ const Layout = ({ children, title }: Props) => {
<aside className="hidden fixed z-10 h-screen lg:flex lg:flex-shrink-0 flex-col">
<Sidebar />
</aside>
<div className="min-h-screen lg:ms-80 bg-gohan flex-1 w-0 flex flex-col lg:rounded-ss-3xl px-5 xl:px-20 2xl:px-32 lg:pt-12 xl:pb-52">
<div className="min-h-screen lg:ms-80 bg-goku flex-1 w-0 flex flex-col lg:rounded-ss-3xl px-5 xl:px-20 2xl:px-32 lg:pt-12 xl:pb-52">
<div className="flex flex-col grow max-w-screen-xl">
{/* Opens sidebar on mobile */}
<Header openSidebar={openSidebar} />
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/ManifestCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ManifestCard: React.FC<Props> = ({
<div
className={mergeClassnames(
'theme-moon-light flex flex-col gap-4 py-6 px-8 rounded-moon-s-lg',
isHighlighted ? 'bg-frieza text-goten' : 'bg-goku text-bulma'
isHighlighted ? 'bg-frieza text-goten' : 'bg-gohan text-bulma'
)}
>
<h3 className="text-moon-24 font-medium">{title}</h3>
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/PropsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const PropsTable = ({ data, title }: TableProps) => (
</thead>
<tbody>
{data.map((prop: Data) => (
<tr key={prop.name} className="bg-goku">
<tr key={prop.name} className="bg-gohan">
<td className="px-3 py-2 whitespace-nowrap text-moon-14 rounded-s-lg">
{prop.name}
</td>
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const Settings = () => {
aria-label="Toggle site settings"
/>
</Popover.Trigger>
<Popover.Panel className="flex flex-col gap-1 p-3 bg-gohan">
<Popover.Panel className="flex flex-col gap-1 p-3">
{isLocalhost && <BrandSwitcher />}
<MenuItem as="div" className="cursor-default">
{isDarkThemeEnabled ? 'Dark mode' : 'Light mode'}
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/TokenTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const TokenTable = ({ data, title }: TokenTableProps) => (
</thead>
<tbody>
{data.map((prop: Data) => (
<tr key={prop.className} className="bg-goku">
<tr key={prop.className} className="bg-gohan">
<td className="px-3 py-2 whitespace-nowrap text-moon-14 rounded-s-lg">
{prop.name}
</td>
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/codePreview/Preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const Preview = ({ title, description, preview, code, className }: Props) => {
{isPreviewActive ? (
<div
className={mergeClassnames(
'flex flex-wrap items-center justify-around p-4 gap-2 w-full bg-goku text-moon-14',
'flex flex-wrap items-center justify-around p-4 gap-2 w-full bg-gohan text-moon-14',
'rounded-moon-s-sm',
className
)}
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/facing/CardArticle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const CardArcticle: React.FC<Props> = ({
target="_blank"
rel="noreferrer"
className={mergeClassnames(
`group relative w-72 h-96 flex flex-col justify-end p-6 bg-goku rounded-moon-s-lg text-moon-16 font-medium`,
`group relative w-72 h-96 flex flex-col justify-end p-6 bg-gohan rounded-moon-s-lg text-moon-16 font-medium`,
variant && variant in variants ? variants[variant] : variants.default
)}
>
Expand Down
10 changes: 4 additions & 6 deletions next-docs/components/search/RenderResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ const RenderResults = ({
}
}}
>
<MenuItem onClick={() => item.perform()} className="hover:bg-goku">
<MenuItem.Title>{item.name}</MenuItem.Title>
{item.section && (
<span className="text-moon-14 text-piccolo">{item.section}</span>
)}
</MenuItem>
<span className="text-moon-14">{item.name}</span>
{item.section && (
<span className="text-moon-14 text-piccolo">{item.section}</span>
)}
</SearchCmdk.ResultItem>
))}
</SearchCmdk.Result>
Expand Down
2 changes: 1 addition & 1 deletion next-docs/components/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import getComponent from '../getComponent';
import SearchButton from '../search/SearchButton';

const Sidebar = ({ closeSidebar }: { closeSidebar?: () => void }) => (
<div className="z-10 fixed top-0 h-screen w-80 flex flex-col flex-grow gap-6 pt-12 pb-28 lg:pb-20 px-5 lg:px-8 bg-goku overflow-y-scroll">
<div className="z-10 fixed top-0 h-screen w-80 flex flex-col flex-grow gap-6 pt-12 pb-28 lg:pb-20 px-5 lg:px-8 bg-gohan overflow-y-scroll">
<div className="flex items-center flex-shrink-0 ps-3 text-bulma">
<LogoLink onClick={() => closeSidebar && closeSidebar()} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion next-docs/pages/components/iconButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ReactNode } from 'react';
import Preview from '../../components/codePreview/Preview';
import ComponentPageDescription from '../../components/ComponentPageDescription';
import type { ComponentNames } from '../../components/getComponent';
import Layout from '../../components/Layout';
import PropsTable from '../../components/PropsTable';
import Animations from '../../public/examples/iconButton/Animations';
Expand All @@ -10,7 +11,6 @@ import Disabled from '../../public/examples/iconButton/Disabled';
import Sizes from '../../public/examples/iconButton/Sizes';
import Variants from '../../public/examples/iconButton/Variants';
import useComponent from '../../utils/useComponent';
import type { ComponentNames } from '../../components/getComponent';

const COMPONENT_NAME: ComponentNames = 'IconButton';

Expand Down
4 changes: 2 additions & 2 deletions next-docs/pages/components/tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ReactNode } from 'react';
import Preview from '../../components/codePreview/Preview';
import ComponentAnatomy from '../../components/ComponentAnatomy';
import ComponentPageDescription from '../../components/ComponentPageDescription';
import type { ComponentNames } from '../../components/getComponent';
import Layout from '../../components/Layout';
import PropsTable from '../../components/PropsTable';
import Default from '../../public/examples/tabs/Default';
Expand All @@ -12,7 +13,6 @@ import Sizes from '../../public/examples/tabs/Sizes';
import WithCustomStyles from '../../public/examples/tabs/WithCustomStyles';
import WithHandler from '../../public/examples/tabs/WithHandler';
import useComponent from '../../utils/useComponent';
import type { ComponentNames } from '../../components/getComponent';

const COMPONENT_NAME: ComponentNames = 'Tabs';

Expand Down Expand Up @@ -84,7 +84,7 @@ const PageTabs = () => {
title="Segment control view"
preview={<Segment />}
code={examples ? examples.Segment : 'Loading'}
className="bg-gohan border border-beerus"
className="bg-goku border border-beerus"
/>
<Preview
title="Sizes"
Expand Down
Loading
Loading