Skip to content

Commit 10c93f9

Browse files
committed
address feedback on PR
1 parent f99161a commit 10c93f9

24 files changed

Lines changed: 139 additions & 215 deletions

src/components/fulfillmentTile/CdrFulfillmentTile.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ defineOptions({ name: 'CdrFulfillmentTile' });
1212
const props = withDefaults(defineProps<surfaceSelection>(), {
1313
tag: 'div',
1414
role: 'checkbox',
15+
borderRadius: 'soft'
1516
});
1617
1718
const style = useCssModule();

src/components/fulfillmentTile/__tests__/__snapshots__/CdrFulfillmentTile.spec.js.snap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ exports[`CdrFulfillmentTile > applies checked state 1`] = `
55
aria-checked="true"
66
aria-disabled="false"
77
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
8+
data-border-radius="soft"
89
data-loading="false"
910
role="checkbox"
1011
>
@@ -56,6 +57,7 @@ exports[`CdrFulfillmentTile > applies disabled state 1`] = `
5657
aria-checked="false"
5758
aria-disabled="true"
5859
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
60+
data-border-radius="soft"
5961
data-loading="false"
6062
role="checkbox"
6163
>
@@ -107,6 +109,7 @@ exports[`CdrFulfillmentTile > applies loading state 1`] = `
107109
aria-checked="false"
108110
aria-disabled="false"
109111
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
112+
data-border-radius="soft"
110113
data-loading="true"
111114
role="checkbox"
112115
>
@@ -158,6 +161,7 @@ exports[`CdrFulfillmentTile > applies multiple states 1`] = `
158161
aria-checked="true"
159162
aria-disabled="true"
160163
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
164+
data-border-radius="soft"
161165
data-loading="true"
162166
role="checkbox"
163167
>
@@ -209,6 +213,7 @@ exports[`CdrFulfillmentTile > base classes only 1`] = `
209213
aria-checked="false"
210214
aria-disabled="false"
211215
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
216+
data-border-radius="soft"
212217
data-loading="false"
213218
role="checkbox"
214219
>
@@ -260,6 +265,7 @@ exports[`CdrFulfillmentTile > default snapshot 1`] = `
260265
aria-checked="false"
261266
aria-disabled="false"
262267
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
268+
data-border-radius="soft"
263269
data-loading="false"
264270
role="checkbox"
265271
>
@@ -311,6 +317,7 @@ exports[`CdrFulfillmentTile > renders body slot 1`] = `
311317
aria-checked="false"
312318
aria-disabled="false"
313319
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
320+
data-border-radius="soft"
314321
data-loading="false"
315322
role="checkbox"
316323
>
@@ -377,6 +384,7 @@ exports[`CdrFulfillmentTile > renders footer slot 1`] = `
377384
aria-checked="false"
378385
aria-disabled="false"
379386
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
387+
data-border-radius="soft"
380388
data-loading="false"
381389
role="checkbox"
382390
>
@@ -443,6 +451,7 @@ exports[`CdrFulfillmentTile > renders header slot 1`] = `
443451
aria-checked="false"
444452
aria-disabled="false"
445453
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
454+
data-border-radius="soft"
446455
data-loading="false"
447456
role="checkbox"
448457
>
@@ -513,6 +522,7 @@ exports[`CdrFulfillmentTile > renders icon-left slot 1`] = `
513522
aria-checked="false"
514523
aria-disabled="false"
515524
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
525+
data-border-radius="soft"
516526
data-loading="false"
517527
role="checkbox"
518528
>
@@ -594,6 +604,7 @@ exports[`CdrFulfillmentTile > renders icon-right slot 1`] = `
594604
aria-checked="false"
595605
aria-disabled="false"
596606
class="cdr-surface cdr-surface-selection cdr-fulfillment-tile"
607+
data-border-radius="soft"
597608
data-loading="false"
598609
role="checkbox"
599610
>

src/components/fulfillmentTile/examples/FulfillmentTile.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ defineOptions({ name: 'FulfillmentTile' });
5959
<style lang="scss" scoped>
6060
.example {
6161
display: flex;
62+
flex-wrap: wrap;
6263
gap: var(--cdr-space-one-x);
6364
}
6465
6566
.example__tile {
66-
height: 108px;
67+
min-height: 108px;
6768
width: 230px;
6869
}
6970
</style>

src/components/fulfillmentTile/styles/CdrFulfillmentTileIcon.module.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
.cdr-fulfillment-tile-icon {
2-
width: 2.2rem;
3-
height: 2.2rem;
4-
background: white;
5-
display: flex;
62
align-items: center;
7-
justify-content: center;
3+
background: white;
84
border-radius: var(--cdr-radius-round);
9-
position: relative;
5+
display: flex;
106
fill: var(--cdr-fulfillment-tile-icon-fill);
117
flex-shrink: 0;
8+
height: 2.2rem;
9+
justify-content: center;
10+
position: relative;
11+
width: 2.2rem;
1212

1313
&::after {
1414
content: '';

src/components/mediaObject/__tests__/CdrMediaObject.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const examples = [
8383
{
8484
label: 'pass down props to Layout and Surface',
8585
props: {
86-
background: 'brand-spruce',
86+
background: 'brand',
8787
as: CdrSurfaceRaw,
8888
},
8989
},

src/components/mediaObject/__tests__/__snapshots__/CdrMediaObject.spec.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ exports[`CdrMediaObject > snapshot tests > overlay, row align, column align, con
325325
exports[`CdrMediaObject > snapshot tests > pass down props to Layout and Surface 1`] = `
326326
<div
327327
class="cdr-surface cdr-layout cdr-layout--rows cdr-layout--columns cdr-media-object"
328-
data-background="brand-spruce"
328+
data-background="brand"
329329
style="--cdr-layout-rows: auto; --cdr-layout-columns: 1fr 1fr; --cdr-media-object-media-position: 'media content'; --cdr-media-object-align: start;"
330330
>
331331

src/components/mediaObject/examples/MediaObject.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ const examples: MediaObjectExample[] = [
147147
{
148148
label: 'pass down props to Layout and Surface',
149149
props: {
150-
background: 'brand-spruce',
150+
background: 'brand',
151151
gap: 'two-x',
152152
contentPadding: 'zero',
153153
},

src/components/surface/CdrSurface.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { getSurfaceProps } from '../../utils/surface';
77
defineOptions({ name: 'CdrSurface' });
88
99
const props = withDefaults(defineProps<surface>(), {
10-
variant: 'base',
1110
tag: 'div',
1211
});
1312

src/components/surface/__tests__/CdrSurface.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ describe('CdrSurface', () => {
4949
});
5050

5151
it('applies radius property', () => {
52-
const wrapper = mount(CdrSurface, { props: { radius: 'soft' } });
53-
expect(wrapper.attributes('data-radius')).toBe('soft');
52+
const wrapper = mount(CdrSurface, { props: { borderRadius: 'soft' } });
53+
expect(wrapper.attributes('data-border-radius')).toBe('soft');
5454
expect(wrapper.element).toMatchSnapshot();
5555
});
5656

@@ -67,15 +67,15 @@ describe('CdrSurface', () => {
6767
borderColor: 'primary',
6868
borderWidth: 'one-x',
6969
borderStyle: 'solid',
70-
radius: 'soft',
70+
borderRadius: 'soft',
7171
boxShadow: 'raised'
7272
}
7373
});
7474
expect(wrapper.attributes('data-background')).toBe('secondary');
7575
expect(wrapper.attributes('data-border-color')).toBe('primary');
7676
expect(wrapper.attributes('data-border-width')).toBe('one-x');
7777
expect(wrapper.attributes('data-border-style')).toBe('solid');
78-
expect(wrapper.attributes('data-radius')).toBe('soft');
78+
expect(wrapper.attributes('data-border-radius')).toBe('soft');
7979
expect(wrapper.attributes('data-box-shadow')).toBe('raised');
8080
expect(wrapper.element).toMatchSnapshot();
8181
});

src/components/surface/__tests__/__snapshots__/CdrSurface.spec.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ exports[`CdrSurface > applies multiple properties 1`] = `
6565
class="cdr-surface"
6666
data-background="secondary"
6767
data-border-color="primary"
68+
data-border-radius="soft"
6869
data-border-style="solid"
6970
data-border-width="one-x"
7071
data-box-shadow="raised"
71-
data-radius="soft"
7272
>
7373
7474
@@ -89,7 +89,7 @@ exports[`CdrSurface > applies palette property 1`] = `
8989
exports[`CdrSurface > applies radius property 1`] = `
9090
<div
9191
class="cdr-surface"
92-
data-radius="soft"
92+
data-border-radius="soft"
9393
>
9494
9595

0 commit comments

Comments
 (0)