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

Theme-8px/sidepage #2218

Merged
merged 9 commits into from
Mar 25, 2021
Merged

Theme-8px/sidepage #2218

merged 9 commits into from
Mar 25, 2021

Conversation

rustho
Copy link
Contributor

@rustho rustho commented Nov 20, 2020

add
sidePageBackingBg
sidePageBackingBgOpacity
sidePagePaddingLeft
sidePagePaddingRight
sidePagePaddingTop
sidePagePaddingBottom
sidePageFooterPaddingTop
sidePageBodyPaddingBottom
sidePageBgDefault
sidePageBorderColor
sidePageHeaderFontSize
sidePageHeaderLineHeight
sidePageHeaderPaddingBottom
sidePageHeaderFixedFontSize
sidePageHeaderFixedLineHeight
sidePageHeaderFixedPadding
sidePageCloseBtnPadding
sidePageFooterPanelPaddingTop
sidePageFooterPanelPaddingBottom

@StathamJason
Copy link
Contributor

Потом надо будет после объединения подвязаться на переменные модалки

@StathamJason StathamJason requested a review from zhzz March 18, 2021 08:35
@zhzz zhzz mentioned this pull request Mar 19, 2021
Merged
14 tasks
zhzz
zhzz requested changes Mar 23, 2021
View reviewed changes
Copy link
Member

@zhzz zhzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Можно подлить в ветку theme-8px/all и попробовать подвязаться на модалку.

packages/react-ui/components/SidePage/SidePage.styles.ts Outdated Show resolved Hide resolved
packages/react-ui/components/SidePage/SidePage.styles.ts Outdated Show resolved Hide resolved
packages/react-ui/components/SidePage/SidePage.styles.ts Outdated Show resolved Hide resolved
packages/react-ui/internal/themes/DefaultTheme.ts Outdated Show resolved Hide resolved
packages/react-ui/internal/themes/DefaultTheme.ts Outdated Show resolved Hide resolved
packages/react-ui/components/SidePage/SidePageContext.ts Show resolved Hide resolved
packages/react-ui/components/SidePage/SidePageBody.tsx Outdated Show resolved Hide resolved
packages/react-ui/components/SidePage/SidePageHeader.tsx Outdated Show resolved Hide resolved
packages/react-ui/components/SidePage/SidePageHeader.tsx Outdated Show resolved Hide resolved
packages/react-ui/components/SidePage/helpers.ts Outdated Show resolved Hide resolved
@vercel
Copy link

vercel bot commented Mar 24, 2021 •
edited
Loading

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

storybook-flat – ./packages/react-ui

🔍 Inspect: https://vercel.com/reactui/storybook-flat/2PkJTWExLorqYQZANXtVbFwtUFe9
✅ Preview: https://storybook-flat-git-theme-8px-sidepage-reactui.vercel.app

storybook-8px – ./packages/react-ui

🔍 Inspect: https://vercel.com/reactui/storybook-8px/Bz9Zja9YycGBrZXLrvXxUhCKpJXY
✅ Preview: https://storybook-8px-git-theme-8px-sidepage-reactui.vercel.app

storybook-default – ./packages/react-ui

🔍 Inspect: https://vercel.com/reactui/storybook-default/4bmUohpugDZFHayAEojpFjGtHcD2
✅ Preview: https://storybook-default-git-theme-8px-sidepage-reactui.vercel.app

@vercel vercel bot temporarily deployed to Preview – storybook-flat March 24, 2021 11:16 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-8px March 24, 2021 11:16 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-default March 24, 2021 11:16 Inactive
@StathamJason StathamJason requested a review from zhzz March 24, 2021 11:52
@zhzz zhzz changed the base branch from master to theme-8px/all March 25, 2021 06:38
@vercel vercel bot temporarily deployed to Preview – storybook-flat March 25, 2021 07:57 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-default March 25, 2021 07:57 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-8px March 25, 2021 07:57 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-default March 25, 2021 09:35 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-8px March 25, 2021 09:35 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-flat March 25, 2021 09:35 Inactive
@zhzz
Copy link
Member

zhzz commented Mar 25, 2021

Докинул правок:

  1. Обновил некоторые переменные в соответствии с макетами и соглашению по именам
  2. Подправил проверку на тип компонента
  3. Перенес все отступы в компонент Container потому что это есть его основная функция
  4. Подправил отступ от футера по макетам. Он должен появляться только когда футер с панелью.

@vercel vercel bot temporarily deployed to Preview – storybook-flat March 25, 2021 10:51 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-default March 25, 2021 10:51 Inactive
@vercel vercel bot temporarily deployed to Preview – storybook-8px March 25, 2021 10:51 Inactive
@zhzz zhzz marked this pull request as ready for review March 25, 2021 11:26
@zhzz zhzz requested a review from StathamJason March 25, 2021 11:27
@zhzz zhzz merged commit 9967db4 into theme-8px/all Mar 25, 2021
@zhzz zhzz deleted the theme-8px/sidepage branch March 25, 2021 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StathamJason StathamJason StathamJason approved these changes

@zhzz zhzz zhzz approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rustho @StathamJason @zhzz