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

Remove material from button component #1199

Merged
merged 17 commits into from Sep 1, 2022
Merged

Remove material from button component #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6617497
Remove material from button component
raquelarrojo Jul 25, 2022
4670277
Small change in button
raquelarrojo Jul 25, 2022
5625736
Change in button styles
raquelarrojo Jul 25, 2022
595ccaf
Fix button focus
raquelarrojo Jul 26, 2022
4c12e52
Fix button focus
raquelarrojo Jul 26, 2022
c7b5508
Refactor styles button component
raquelarrojo Jul 29, 2022
1719ec2
Updated button stories
raquelarrojo Jul 29, 2022
d291c5b
Fix button
raquelarrojo Jul 29, 2022
11bc9e1
Fix button
raquelarrojo Jul 29, 2022
7ae0f17
Fix min-width button
raquelarrojo Jul 29, 2022
13a8073
Remove button container
raquelarrojo Jul 29, 2022
8ba8b21
Fix button
raquelarrojo Jul 29, 2022
cd89a9c
Change button
raquelarrojo Jul 29, 2022
cbdcbfa
Fix in button types
raquelarrojo Aug 1, 2022
186bcc6
Merge branch 'master' into rarrojolopez-button
raquelarrojo Aug 1, 2022
f4a92d7
Merge branch 'master' into rarrojolopez-button
Jialecl Sep 1, 2022
f055dca
Removed stack from button stories
raquelarrojo Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/pages/Button.jsx
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@ function App() {

return (
<div>
<div>
<h4>Disabled</h4>
<h4>Disabled</h4>
<div style={{ display: "flex" }}>
<DxcButton
mode="primary"
label="Custom Button"
Expand Down
4 changes: 2 additions & 2 deletions docs/src/pages/components/cdk-components/button/examples/modes.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ const code = `() => {
};

return (
<div>
<div style={{ display: "flex" }}>
<DxcButton
mode="primary"
label="Primary Button"
Expand All @@ -30,7 +30,7 @@ const code = `() => {
}`;

const scope = {
DxcButton
DxcButton,
};

export default { code, scope };
2 changes: 1 addition & 1 deletion docs/src/pages/components/cdk-components/button/examples/withIcon.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ const code = `() => {
};

return (
<div>
<div style={{ display: "flex" }}>
<DxcButton
label="Primary Button"
onClick={onClick}
Expand Down
9 changes: 9 additions & 0 deletions lib/src/button/Button.stories.tsx
View file
Open in desktop
@@ -1,5 +1,6 @@
import React from "react";
import DxcButton from "./Button";
import DxcFlex from "./../flex/Flex";
import { BackgroundColorProvider } from "../BackgroundColorContext";
import Title from "../../.storybook/components/Title";
import ExampleContainer from "../../.storybook/components/ExampleContainer";
Expand Down Expand Up @@ -270,5 +271,13 @@ export const Chromatic = () => (
<Title title="Xxlarge margin" theme="light" level={4} />
<DxcButton label="Xxlarge margin" margin="xxlarge" />
</ExampleContainer>
<Title title="Inside a flex" theme="light" level={2} />
<ExampleContainer>
<DxcFlex direction="column" gap="0.75rem">
<DxcButton label="Button" />
<DxcButton label="Button" />
<DxcButton label="Button" />
</DxcFlex>
</ExampleContainer>
</>
);