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.

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

Dumb Bell, Mobile icons + Fix missing attribute for Submit Button #254

Merged
merged 6 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
src/theme.js
package-lock.json
node_modules
1 change: 1 addition & 0 deletions src/components/Buttons/ButtonGroup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const Button = ({
as: Tag = "button",
isActive,
shouldShowText = true,
/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
isHidden = false,
size = "medium",
icon,
Expand Down
1 change: 1 addition & 0 deletions src/components/Buttons/SubmitButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const SubmitButton = ({

return (
<Button
type="submit"
color={color}
disabled={showTransition || disabled}
variant={variant}
Expand Down
2 changes: 1 addition & 1 deletion src/icons/ClockManualIcon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export const ClockManualIcon = createIcon((props) => {
);
});

ClockManualIcon.tags = ["clock", "manual", "watch"];
ClockManualIcon.tags = ["clock", "manual", "watch", "fly", "on the fly"];
39 changes: 39 additions & 0 deletions src/icons/DumbbellIcon.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import React from "react";
import { createIcon } from "../helpers/icon";

export const DumbbellIcon = createIcon((props) => {
return (
<svg viewBox="0 0 14 14" width={14} height={14} fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
<path
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="0.8"
d="M9.745 2.203a.687.687 0 000 .972l2.004 2.003a.687.687 0 10.972-.972l-2.004-2.003a.688.688 0 00-.972 0z"
/>
<path
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="0.8"
d="M7.801 2.202a.687.687 0 000 .973l3.949 3.948a.687.687 0 10.972-.974L8.775 2.202a.688.688 0 00-.974 0zM2.812 9.137a.688.688 0 01.972 0l2.004 2.003a.688.688 0 01-.973.972L2.812 10.11a.687.687 0 010-.972z"
/>
<path
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="0.8"
d="M2.812 7.192a.688.688 0 01.972 0l3.948 3.948a.688.688 0 11-.973.973L2.812 8.166a.688.688 0 010-.974z"
/>
<path
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="0.8"
d="M9.289 4.663L5.27 8.68l.973.972 4.017-4.017-.972-.972z"
/>
</svg>
);
});

DumbbellIcon.tags = ["weight", "exercise", "gym"];
26 changes: 26 additions & 0 deletions src/icons/MobileIcon.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from "react";
import { createIcon } from "../helpers/icon";

export const MobileIcon = createIcon((props) => {
return (
<svg width={18} height={18} viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
<g
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="1.3"
clipPath="url(#clip0_9896_373783)"
>
<path d="M13.5 14.25a1.5 1.5 0 01-1.5 1.5H6a1.5 1.5 0 01-1.5-1.5V3.75A1.5 1.5 0 016 2.25h6a1.5 1.5 0 011.5 1.5v10.5z" />
<path d="M10.877 2.25v1.5a.375.375 0 01-.375.375h-3a.375.375 0 01-.375-.375v-1.5" />
</g>
<defs>
<clipPath id="clip0_9896_373783">
<path fill="#fff" d="M0 0H18V18H0z" />
</clipPath>
</defs>
</svg>
);
});

MobileIcon.tags = ["mobile", "phone", "iphone", "android", "ios"];
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ export { DownloadIcon } from "./icons/DownloadIcon";
export { DownArrowIcon } from "./icons/DownArrowIcon";
export { DropdownIcon } from "./icons/DropdownIcon";
export { DuplicateIcon } from "./icons/DuplicateIcon";
export { DumbbellIcon } from "./icons/DumbbellIcon";
export { DurationIcon } from "./icons/DurationIcon";
export { EditIcon } from "./icons/EditIcon";
export { EditNoteIcon } from "./icons/EditNoteIcon";
Expand Down Expand Up @@ -188,6 +189,7 @@ export { MenuIcon } from "./icons/MenuIcon";
export { MegaphoneIcon } from "./icons/MegaphoneIcon";
export { MixedChecklistIcon } from "./icons/MixedChecklistIcon";
export { MinusIcon } from "./icons/MinusIcon";
export { MobileIcon } from "./icons/MobileIcon";
export { MountainIcon } from "./icons/MountainIcon";
export { MoneyAddIcon } from "./icons/MoneyAddIcon";
export { MoneyBackIcon } from "./icons/MoneyBackIcon";
Expand Down
Loading