Skip to content

Commit e99af19

Browse files
authored
Merge pull request #539 from dnum-mi/develop
Develop
2 parents f109abf + 2b900e3 commit e99af19

File tree

47 files changed

+63
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+63
-79
lines changed

src/components/DsfrAlert/DsfrAlert.stories.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ export const Alerte = (args) => ({
7878
},
7979
},
8080

81-
8281
})
8382
Alerte.args = {
8483
title: 'Titre alerte',
@@ -128,7 +127,6 @@ export const Alertes = (args) => ({
128127
</div>
129128
`,
130129

131-
132130
})
133131
Alertes.args = {
134132
}
@@ -171,7 +169,6 @@ export const PetitesAlertes = (args) => ({
171169
</div>
172170
`,
173171

174-
175172
})
176173
PetitesAlertes.args = {
177174
}
@@ -269,8 +266,6 @@ export const AlertesFermables = (args) => ({
269266
</div>
270267
`,
271268

272-
273-
274269
methods: {
275270
close (idx) {
276271
this.closed[idx] = true

src/components/DsfrBreadcrumb/DsfrBreadcrumb.stories.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export const FilDAriane = (args) => ({
4646
/>
4747
`,
4848

49-
5049
})
5150

5251
FilDAriane.args = {

src/components/DsfrButton/DsfrButton.stories.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export const BoutonPrimaire = (args) => ({
7272
/>
7373
`,
7474

75-
7675
})
7776
BoutonPrimaire.args = {
7877
label: 'Label bouton',
@@ -105,7 +104,6 @@ export const BoutonPrimaireAvecIcone = (args) => ({
105104
/>
106105
`,
107106

108-
109107
})
110108
BoutonPrimaireAvecIcone.args = {
111109
label: 'Label bouton',
@@ -134,7 +132,6 @@ export const BoutonSecondaire = (args) => ({
134132
/>
135133
`,
136134

137-
138135
})
139136
BoutonSecondaire.args = {
140137
label: 'Label bouton secondaire',
@@ -162,7 +159,6 @@ export const BoutonTertiaire = (args) => ({
162159
/>
163160
`,
164161

165-
166162
})
167163
BoutonTertiaire.args = {
168164
label: 'Label bouton secondaire',
@@ -190,7 +186,6 @@ export const BoutonTertiaireSansBordure = (args) => ({
190186
/>
191187
`,
192188

193-
194189
})
195190
BoutonTertiaireSansBordure.args = {
196191
label: 'Label bouton secondaire',
@@ -225,7 +220,6 @@ export const SuiteDeBoutons = (args) => ({
225220
</div>
226221
`,
227222

228-
229223
})
230224

231225
SuiteDeBoutons.args = {

src/components/DsfrButton/DsfrButtonGroup.stories.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export const GroupeDeBoutons = (args) => ({
7272
/>
7373
`,
7474

75-
7675
})
7776
GroupeDeBoutons.args = {
7877
align: 'center',

src/components/DsfrCallout/DsfrCallout.stories.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ export const MiseEnAvantSimple = (args) => ({
6565
/>
6666
`,
6767

68-
6968
})
7069
MiseEnAvantSimple.args = {
7170
title: 'Titre de la mise en avant',
@@ -101,7 +100,6 @@ export const MiseEnAvant = (args) => ({
101100
/>
102101
`,
103102

104-
105103
})
106104
MiseEnAvant.args = {
107105
title: 'Titre de la mise en avant',

src/components/DsfrCard/DsfrCard.stories.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export const Card = (args) => ({
6666
/>
6767
`,
6868

69-
7069
})
7170
Card.args = {
7271
altImg: '',
@@ -99,7 +98,6 @@ export const CardSansFleche = (args) => ({
9998
/>
10099
`,
101100

102-
103101
})
104102
CardSansFleche.args = {
105103
altImg: '',

src/components/DsfrCheckbox/DsfrCheckbox.stories.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export default {
3131
control: 'boolean',
3232
description: 'Indique si le champ est obligatoire',
3333
},
34+
small: {
35+
control: 'boolean',
36+
description: 'Utilise la version réduite de la case à cocher',
37+
},
3438
errorMessage: {
3539
control: 'text',
3640
description: 'Texte du message à afficher en cas d’erreur',
@@ -60,6 +64,7 @@ export const Checkbox = (args) => ({
6064
:label="label"
6165
:disabled="disabled"
6266
:required="required"
67+
:small="small"
6368
:hint="hint"
6469
:name="name || 'name1'"
6570
v-model="modelValue"
@@ -75,6 +80,7 @@ Checkbox.args = {
7580
disabled: false,
7681
modelValue: false,
7782
required: false,
83+
small: false,
7884
label: 'Checkbox 1',
7985
name: 'name1',
8086
hint: 'Description 1',

src/components/DsfrCheckbox/DsfrCheckbox.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export default defineComponent({
1818
},
1919
required: Boolean,
2020
modelValue: Boolean,
21+
small: Boolean,
2122
label: {
2223
type: String,
2324
default: '',
@@ -55,6 +56,7 @@ export default defineComponent({
5556
:class="{
5657
'fr-checkbox-group--error': errorMessage,
5758
'fr-checkbox-group--valid': validMessage,
59+
'fr-checkbox-group--sm': small,
5860
}"
5961
>
6062
<input

src/components/DsfrCheckbox/DsfrCheckboxSet.stories.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ export default {
2424
control: 'boolean',
2525
description: 'Indique si les checkboxes doivent apparaître sur une seule ligne (`true`) ou non (`false`, défaut)',
2626
},
27+
small: {
28+
control: 'boolean',
29+
description: 'Utilise la version réduite des checkboxes',
30+
},
2731
// legend: {
2832
// control: 'text',
2933
// description: 'Titre de l’ensemble (Set) des checkboxes',
@@ -58,6 +62,7 @@ export const CheckboxSet = (args) => ({
5862
:options="options"
5963
:inline="inline"
6064
:disabled="disabled"
65+
:small="small"
6166
:required="required"
6267
:errorMessage="errorMessage"
6368
:validMessage="validMessage"
@@ -75,6 +80,7 @@ CheckboxSet.args = {
7580
disabled: false,
7681
inline: false,
7782
required: false,
83+
small: false,
7884
errorMessage: '',
7985
validMessage: '',
8086
modelValue: ['name1'],

src/components/DsfrCheckbox/DsfrCheckboxSet.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export default defineComponent({
2121
disabled: Boolean,
2222
inline: Boolean,
2323
required: Boolean,
24+
small: Boolean,
2425
errorMessage: {
2526
type: String,
2627
default: '',
@@ -104,6 +105,7 @@ export default defineComponent({
104105
:name="option.name"
105106
:label="option.label"
106107
:disabled="option.disabled"
108+
:small="small"
107109
:model-value="modelValue.includes(option.name)"
108110
:hint="option.hint"
109111
@update:model-value="onChange({ name: option.name, checked: $event })"

0 commit comments

Comments
 (0)