Skip to content

Commit 8700b46

Browse files
committed
Changes to scss imports as well as removing unncessary styles on -medium modifier for button
1 parent 6ec2f65 commit 8700b46

5 files changed

Lines changed: 13 additions & 10 deletions

File tree

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
@import "~bourbon", "~andculturecode-scss-grid/src/andculturecode-scss-grid";
1+
@import "~bourbon";
2+
@import "~andculturecode-scss-grid/src/andculturecode-scss-grid";

src/assets/scss/2-tools/__tools.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
*
1010
*/
1111

12-
@import "functions", "mixins";
12+
@import "functions";
13+
@import "mixins";

src/assets/scss/6-components/atoms/_buttons.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
width: 100%;
3434
}
3535

36-
&.-medium {
37-
@include padding(11px, 24px);
38-
}
39-
4036
&.-small {
4137
@include padding(7px, 16px);
4238
@include font-style($font-primary, "xsmall", #ffffff, 800, 12px);

src/assets/scss/andculturecode-javascript-react-components.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
* Utilities and helper classes with ability to override anything which goes before in the triangle, eg. hide helper class
2424
*/
2525

26-
@import "0-vendor/__vendor", "1-settings/__settings", "2-tools/__tools",
27-
"3-generic/__generic", "4-elements/__elements", "5-objects/__objects",
28-
"6-components/__components", "7-utilities/__utilities";
26+
@import "0-vendor/__vendor";
27+
@import "1-settings/__settings";
28+
@import "2-tools/__tools";
29+
@import "3-generic/__generic";
30+
@import "4-elements/__elements";
31+
@import "5-objects/__objects";
32+
@import "6-components/__components";
33+
@import "7-utilities/__utilities";

src/atoms/buttons/button.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const buttonIcon = () => {
3434
style={select("style", ButtonStyles, ButtonStyles.Primary)}
3535
accessibleText={text("Accessible Text", "Text for screen reader")}>
3636
<Icon
37-
type={select("type", Icons, Icons.Close)}
37+
type={select("type", Icons, Icons.Checkmark)}
3838
size={select("icon size", IconSizes, IconSizes.Large)}
3939
/>
4040
</Button>

0 commit comments

Comments
 (0)