Skip to content

Commit

Permalink
fix: Added fix to push-to-main workflow, this will build the package …
Browse files Browse the repository at this point in the history
…to deploy (#35)

* fix: Added fix to push-to-main workflow, this will build the package to deploy

* fix: Added relative imports back to all package source files

Co-authored-by: Spencer Duball <spencer@spencerduball.com>
  • Loading branch information
SpencerDuball and Spencer Duball committed May 1, 2022
1 parent 307940d commit 7df6d59
Show file tree
Hide file tree
Showing 26 changed files with 31 additions and 29 deletions.
8 changes: 5 additions & 3 deletions README.md
@@ -1,8 +1,10 @@
<p align="center">
<a href="https://www.radix-ui.com/colors">
<img src="doc/images/radix-ui-logo_light.png#gh-light-mode-only" alt="radix-ui logo" height="50px" width="50px" />
<img src="doc/images/radix-ui-logo_dark.png#gh-dark-mode-only" alt="radix-ui logo" height="50px" width="50px" />
</a>
<div height="50px" width="50px">
![radix-ui logo](doc/images/radix-ui-logo_light.png#gh-light-mode-only)
![radix-ui logo](doc/images/radix-ui-logo_dark.png#gh-dark-mode-only)
</div>
</a>
<img src="doc/images/plus.png" alt="plus icon" height="50px" w="50px" />
<a href="https://www.chakra-ui.com">
<img src="doc/images/chakra-ui-logo.png" alt="chakra-ui logo" height="50px" width="50px" />
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/alert/alert.ts
Expand Up @@ -5,7 +5,7 @@ import type {
PartsStyleFunction,
StyleFunctionProps,
} from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

// Please visit: https://www.radix-ui.com/docs/colors/palette-composition/understanding-the-scale
// to understand which values were used where. This link provides a style guide for using colors
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/badge/badge.ts
Expand Up @@ -3,7 +3,7 @@ import type {
SystemStyleFunction,
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyle: SystemStyleObject = {
px: 1,
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/button/button.ts
Expand Up @@ -3,7 +3,7 @@ import type {
SystemStyleObject,
SystemStyleFunction,
} from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyle: SystemStyleObject = {
lineHeight: "1.2",
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/checkbox/checkbox.ts
Expand Up @@ -6,7 +6,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleControl: SystemStyleFunction = (props) => {
const { colorScheme: c, theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/close-button/close-button.ts
Expand Up @@ -3,7 +3,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { cssVar, mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const $size = cssVar("close-button-size");

Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/drawer/drawer.ts
Expand Up @@ -6,7 +6,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

/**
* Since the `maxWidth` prop references theme.sizes internally,
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/form-error/form-error.ts
Expand Up @@ -4,7 +4,7 @@ import type {
SystemStyleFunction,
} from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleText: SystemStyleFunction = (props) => {
const { theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/form/form.ts
Expand Up @@ -4,7 +4,7 @@ import type {
SystemStyleFunction,
} from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleRequiredIndicator: SystemStyleFunction = (props) => {
const { theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/input/input.ts
Expand Up @@ -5,7 +5,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { getColor, mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyle: PartsStyleObject<typeof parts> = {
field: {
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/kbd/kbd.ts
@@ -1,6 +1,6 @@
import type { SystemStyleFunction } from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyle: SystemStyleFunction = (props) => {
const { theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/menu/menu.ts
Expand Up @@ -5,7 +5,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleList: SystemStyleFunction = (props) => {
const { theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/modal/modal.ts
Expand Up @@ -6,7 +6,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleOverlay: SystemStyleObject = {
bg: "_grayA.10",
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/number-input/number-input.ts
Expand Up @@ -8,7 +8,7 @@ import type {
import { calc, cssVar, mode } from "@chakra-ui/theme-tools";
import { theme } from "@chakra-ui/theme";
import Input from "../input/input";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const { variants, defaultProps } = Input;

Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/popover/popover.ts
Expand Up @@ -5,7 +5,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { cssVar, mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const $popperBg = cssVar("popper-bg");

Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/progress/progress.ts
Expand Up @@ -9,7 +9,7 @@ import {
SystemStyleObject,
SystemStyleFunction,
} from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

function filledStyle(props: StyleFunctionProps): SystemStyleObject {
const { colorScheme: c, theme, isIndeterminate, hasStripe } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/select/select.ts
Expand Up @@ -8,7 +8,7 @@ import type {
import { mergeWith } from "@chakra-ui/utils";
import { mode } from "@chakra-ui/theme-tools";
import Input from "../input/input";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleField: SystemStyleFunction = (props) => {
const { theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/skeleton/skeleton.ts
@@ -1,7 +1,7 @@
import { keyframes } from "@chakra-ui/system";
import type { SystemStyleFunction } from "@chakra-ui/theme-tools";
import { getColor, mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const fade = (startColor: string, endColor: string) =>
keyframes({
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/skip-link/skip-link.ts
@@ -1,6 +1,6 @@
import type { SystemStyleFunction } from "@chakra-ui/theme-tools";
import { mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyle: SystemStyleFunction = (props) => {
const { theme } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/slider/slider.ts
Expand Up @@ -6,7 +6,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { mode, orient } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

function thumbOrientation(props: StyleFunctionProps): SystemStyleObject {
return orient({
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/switch/switch.ts
Expand Up @@ -6,7 +6,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { calc, cssVar, mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const $width = cssVar("switch-track-width");
const $height = cssVar("switch-track-height");
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/table/table.ts
Expand Up @@ -6,7 +6,7 @@ import type {
PartsStyleObject,
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyle: PartsStyleObject<typeof parts> = {
table: {
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/tabs/tabs.ts
Expand Up @@ -7,7 +7,7 @@ import type {
SystemStyleObject,
} from "@chakra-ui/theme-tools";
import { getColor, mode } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const baseStyleRoot: SystemStyleFunction = (props) => {
const { orientation } = props;
Expand Down
2 changes: 1 addition & 1 deletion src/theme/components/tooltip/tooltip.ts
@@ -1,5 +1,5 @@
import { mode, cssVar, SystemStyleFunction } from "@chakra-ui/theme-tools";
import { getColorInfo } from "util/helpers";
import { getColorInfo } from "../../../util/helpers";

const $bg = cssVar("tooltip-bg");
const $arrowBg = cssVar("popper-arrow-bg");
Expand Down
2 changes: 1 addition & 1 deletion src/util/cypress-utils.ts
@@ -1,5 +1,5 @@
import { getColor } from "@chakra-ui/theme-tools";
import { theme } from "theme";
import { theme } from "../theme";
import { hsl, hex } from "color-convert";

/**
Expand Down
4 changes: 2 additions & 2 deletions src/util/helpers.test.tsx
Expand Up @@ -4,10 +4,10 @@ import {
getBaseColorPair,
getColorInfo,
} from "./helpers";
import { theme } from "theme";
import { theme } from "../theme";
import React from "react";
import { Text } from "@chakra-ui/react";
import { render, screen } from "util/test-utils";
import { render, screen } from "./test-utils";

describe("getThemedColor", () => {
test("works with light colors", () => {
Expand Down

0 comments on commit 7df6d59

Please sign in to comment.