Skip to content

Commit

Permalink
Merge branch 'master' into X2-6273
Browse files Browse the repository at this point in the history
  • Loading branch information
rushi authored Jul 5, 2024
2 parents d559ac6 + 90447dd commit 50ab8d5
Show file tree
Hide file tree
Showing 32 changed files with 240 additions and 182 deletions.
132 changes: 70 additions & 62 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xola/ui-kit",
"version": "2.3.2",
"version": "2.3.7",
"description": "Xola UI Kit",
"license": "MIT",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Breakdown.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import clsx from "clsx";
import { isNumber } from "lodash";
import PropTypes from "prop-types";
import React, { createContext, useContext, useMemo } from "react";
import { isNumber } from "lodash";
import clsx from "clsx";
import { Currency } from "./Utilities/Currency";

const colors = {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Buttons/SubmitButton.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Transition } from "@headlessui/react";
import clsx from "clsx";
import PropTypes from "prop-types";
import React, { useState, useEffect } from "react";
import { Spinner } from "../Spinner";
import React, { useEffect, useState } from "react";
import { CheckIcon } from "../../icons";
import { Spinner } from "../Spinner";
import { Button, colors } from "./Button";

const loadingColors = {
Expand Down
4 changes: 2 additions & 2 deletions src/components/DatePicker/DatePicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This does not include the today button
*/
.DayPicker-Month {
@apply my-0 mx-0 p-0 pt-0.5 ring-0 focus:outline-none focus:ring-0;
@apply mx-0 my-0 p-0 pt-0.5 ring-0 focus:outline-none focus:ring-0;
min-width: 400px; /* Odd width given from Figma */
border-collapse: inherit;
border-spacing: 0 8px; /* 8px between each week (row) */
Expand All @@ -52,7 +52,7 @@
/* The "Today" button.
A lot of specific vaules which I normally wouldn't use. But this is a third party lib where I cannot change the markup */
.DayPicker-TodayButton {
@apply absolute top-0 right-24 h-10 px-3.5 py-2.5 leading-4;
@apply absolute right-24 top-0 h-10 px-3.5 py-2.5 leading-4;
@apply rounded border border-solid border-gray bg-white text-base font-semibold tracking-tightest text-black hover:border-blue hover:bg-blue-lighter;
}

Expand Down
Loading

0 comments on commit 50ab8d5

Please sign in to comment.