Skip to content

Commit 9674423

Browse files
authored
Merge pull request #151 from ASU/UDS-489-Fix-Buttons-colors-Card-Header-H4-Font-size
fix(components-library): uds-489 - buttons / card header(h4) preact
2 parents 960ad12 + 37217e7 commit 9674423

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

packages/components-library/src/components/Button/styles.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ const Button = forwardRef(
7979
}
8080
8181
${disabled &&
82-
css`
83-
opacity: ${ComponentButtonDisabledOpacity};
84-
`}
82+
`opacity: ${ComponentButtonDisabledOpacity};`}
8583
8684
${small &&
87-
css`
85+
`
8886
font-size: ${ComponentButtonSmallFontSize};
8987
height: ${ComponentButtonSmallHeight};
9088
min-width: ${ComponentButtonSmallMinWidth};
@@ -93,20 +91,20 @@ const Button = forwardRef(
9391
`}
9492
9593
${medium &&
96-
css`
94+
`
9795
font-size: 0.875rem;
9896
padding: 0.5rem 1rem;
9997
`}
10098
10199
${large &&
102-
css`
100+
`
103101
font-size: ${ComponentButtonLargeFontSize};
104102
height: ${ComponentButtonLargeHeight};
105103
min-width: ${ComponentButtonLargeMinWidth};
106104
`}
107105
108106
${gold &&
109-
css`
107+
`
110108
color: ${ComponentButtonGoldColor};
111109
background-color: ${ComponentButtonGoldBackgroundColor};
112110
@@ -116,7 +114,7 @@ const Button = forwardRef(
116114
`}
117115
118116
${maroon &&
119-
css`
117+
`
120118
color: #ffffff;
121119
background-color: #8c1d40;
122120
border-color: #8c1d40;
@@ -127,7 +125,7 @@ const Button = forwardRef(
127125
`}
128126
129127
${dark &&
130-
css`
128+
`
131129
color: ${ComponentButtonDarkColor};
132130
background-color: ${ComponentButtonDarkBackgroundColor};
133131
@@ -137,7 +135,7 @@ const Button = forwardRef(
137135
`}
138136
139137
${light &&
140-
css`
138+
`
141139
color: ${ComponentButtonLightColor};
142140
background-color: ${ComponentButtonLightBackgroundColor};
143141
`}

packages/components-library/src/components/Card/styles.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const CardBody = ({ show, id, ...props }) => {
7878
min-height: 1px;
7979
padding: 1.25rem;
8080
${!show &&
81-
css`
81+
`
8282
display: none;
8383
`}
8484
`,
@@ -125,7 +125,7 @@ const FoldableCardBody = ({ show, id, ...props }) => {
125125
class={cx(
126126
css`
127127
${show &&
128-
css`
128+
`
129129
border-top: 1px solid #d0d0d0;
130130
`}
131131
`,
@@ -181,7 +181,7 @@ const FoldableCardHeader = ({ show, id, ...props }) => {
181181
182182
${
183183
show
184-
? css`
184+
? `
185185
.fa-chevron-down {
186186
transform: rotate(-180deg);
187187
}

packages/components-library/src/components/Heading/styles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { cx, css } from "@emotion/css";
22

3-
const sharedStyle = css`
3+
const sharedStyle = `
44
font-weight: 700;
55
text-align: left;
66
opacity: 1;

0 commit comments

Comments
 (0)