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

fix:/button-appearance-styles #502

Merged
merged 1 commit into from
Sep 13, 2023
Merged

fix:/button-appearance-styles #502

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
6 changes: 4 additions & 2 deletions ui-admin/icons/src/bag.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const BagIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/chart.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const ChartIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/check.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const CheckIcon = (props: IconProps) => (
<Icon
xmlns='http://www.w3.org/2000/svg'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/close.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const CloseIcon = (props: IconProps) => (
<Icon
viewBox='0 0 24 24'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/drag.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const DragIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
2 changes: 1 addition & 1 deletion ui-admin/icons/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export * from './ruby.icon'
export * from './trash.icon'
export * from './upload.icon'
export * from './user.icon'
export * from './users.icon'
export * from './users.icon'
6 changes: 4 additions & 2 deletions ui-admin/icons/src/loading.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const LoadingIcon = (props: IconProps) => (
<Icon
xmlns='http://www.w3.org/2000/svg'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/logo.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const LogoIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/pencil.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const PencilIcon = (props: IconProps) => (
<Icon
viewBox='0 0 24 24'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/ruby.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const RubyIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/trash.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const TrashIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/upload.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const UploadIcon = (props: IconProps) => (
<Icon width='1em' height='1em' viewBox='0 0 40 40' xmlns='http://www.w3.org/2000/svg' {...props}>
<path d='M19.5312 14.5313C19.2375 14.2375 18.7625 14.2375 18.4688 14.5313L12.325 20.675C12.0312 20.9688 12.0312 21.4438 12.325 21.7375L12.6812 22.0938C12.975 22.3875 13.45 22.3875 13.7437 22.0938L18.0063 17.8313V27.25C18.0063 27.6625 18.3438 28 18.7563 28H19.2563C19.6688 28 20.0063 27.6625 20.0063 27.25V17.8313L24.2687 22.0938C24.5625 22.3875 25.0375 22.3875 25.3312 22.0938L25.6875 21.7375C25.9813 21.4438 25.9813 20.9688 25.6875 20.675L19.5312 14.5313ZM35.7313 18.925C35.9062 18.3063 36 17.6625 36 17C36 13.1313 32.8688 10 29 10C27.9562 10 26.9438 10.225 26 10.675C24.025 7.8625 20.7313 6 17 6C11.1 6 6.26875 10.6563 6.0125 16.5125C2.45 17.7625 0 21.1438 0 25C0 29.975 4.025 34 9 34H32C36.4188 34 40 30.425 40 26C40 23.0625 38.3875 20.325 35.7313 18.925ZM32 32H9C5.13125 32 2 28.8688 2 25C2 21.45 4.6375 18.5188 8.0625 18.0625C8.01875 17.7125 8 17.3563 8 17C8 12.0313 12.0312 8 17 8C20.7687 8 23.9937 10.3125 25.3375 13.6C26.25 12.6188 27.55 12 29 12C31.7625 12 34 14.2375 34 17C34 18.1563 33.6062 19.225 32.9437 20.075C35.8125 20.525 38 23.0063 38 26C38 29.3125 35.3125 32 32 32Z' />
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/user.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const UserIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/users.icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const UsersIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
2 changes: 1 addition & 1 deletion ui-parts/button/src/appearance/appearance.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { combine } from '@atls-ui-parts/styles'
import { ButtonAppearanceStyles } from './appearance.interfaces'

export const createColorStyles: styleFn = (
backgroundColor: string,
color: string,
backgroundColor: string,
borderColor: string
) =>
() => ({
Expand Down
Loading