Skip to content

Commit

Permalink
fix: add extra adjusts
Browse files Browse the repository at this point in the history
  • Loading branch information
omariosouto committed Jan 20, 2022
1 parent 47c1166 commit f25069b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 76 deletions.
2 changes: 2 additions & 0 deletions lib/components/box/box-base.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable react/require-default-props */
import React, { Ref } from 'react';
import { renderCSS } from '@lib/utils/renderCSS';
import { theme } from '@lib/core/theme/theme';
Expand All @@ -6,6 +7,7 @@ import { Breakpoints } from '@lib/core/breakpoints/breakpoints';

interface BoxProps {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type?: any;
as?: any;
id?: string;
name?: string;
Expand Down
2 changes: 2 additions & 0 deletions lib/components/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ export function Button({
fullWidth,
onClick,
iconName,
type,
...props
}: ButtonProps): JSX.Element {
const isLink = Boolean(props.href);
Expand Down Expand Up @@ -231,6 +232,7 @@ export function Button({
}
}
}}
type={isLink ? undefined : type}
{...props}
>
<Text
Expand Down
78 changes: 2 additions & 76 deletions lib/core/theme/theme.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Breakpoints } from '@lib/core/breakpoints/breakpoints';
import baseTheme from './theme.json';

const partition = {
'x1/1': '100%',
Expand Down Expand Up @@ -86,82 +87,7 @@ export const theme = {
[Breakpoints.lg]: 992,
[Breakpoints.xl]: 1200,
},
colors: {
primary: {
x050: '#FFE8D9',
x100: '#FFD0B5',
x200: '#FFB088',
x300: '#FF9466',
x400: '#F9703E',
x500: '#F35627',
x600: '#DE3A11',
x700: '#C52707',
x800: '#AD1D07',
x900: '#841003',
},
accent: {
x050: '#FFE3EC',
x100: '#FFB8D2',
x200: '#FF8CBA',
x300: '#F364A2',
x400: '#E8368F',
x500: '#DA127D',
x600: '#BC0A6F',
x700: '#A30664',
x800: '#870557',
x900: '#620042',
},
neutral: {
x000: '#FFFFFF',
x050: '#F7F7F7',
x100: '#E1E1E1',
x200: '#CFCFCF',
x300: '#B1B1B1',
x400: '#9E9E9E',
x500: '#7E7E7E',
x600: '#626262',
x700: '#515151',
x800: '#3B3B3B',
x900: '#222222',
x999: '#111111',
},
positive: {
x050: '#E3F9E5',
x100: '#C1F2C7',
x200: '#91E697',
x300: '#51CA58',
x400: '#31B237',
x500: '#18981D',
x600: '#0F8613',
x700: '#0E7817',
x800: '#07600E',
x900: '#014807',
},
negative: {
x050: '#FFE3E3',
x100: '#FFBDBD',
x200: '#FF9B9B',
x300: '#F86A6A',
x400: '#EF4E4E',
x500: '#E12D39',
x600: '#CF1124',
x700: '#AB091E',
x800: '#8A041A',
x900: '#610316',
},
warning: {
x050: '#FFFBEA',
x100: '#FFF3C4',
x200: '#FCE588',
x300: '#FADB5F',
x400: '#F7C948',
x500: '#F0B429',
x600: '#DE911D',
x700: '#CB6E17',
x800: '#B44D12',
x900: '#8D2B0B',
},
},
colors: baseTheme.colors,
typography: {
fontFamily: "'Open Sans', sans-serif",
variants: {
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"sourceMap": true,
"emitDeclarationOnly": true,
"skipLibCheck": true,
"resolveJsonModule": true,
"typeRoots": [
"./node_modules/@types",
"./@types"
Expand Down

3 comments on commit f25069b

@vercel
Copy link

@vercel vercel bot commented on f25069b Jan 20, 2022

Choose a reason for hiding this comment

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

@vercel
Copy link

@vercel vercel bot commented on f25069b Jan 20, 2022

Choose a reason for hiding this comment

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

@vercel
Copy link

@vercel vercel bot commented on f25069b Jan 20, 2022

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

sknui-demobase-react – ./examples/demo_base

sknui-demobase-react-git-main-skynexui.vercel.app
sknui-demobase-react.vercel.app
sknui-demobase-react-skynexui.vercel.app

Please sign in to comment.