Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 983444b

Browse files
committed
Squashed commit of the following:
commit d547ef0 Merge: d84f022 99e371b Author: Johan Silvergrund <johan.silvergrund@hiq.se> Date: Tue Apr 21 14:49:01 2020 +0200 Merge pull request #107 from helsingborg-stad/feature/splitbutton-borders Splitbutton commit d84f022 Merge: 9fdaa66 a611775 Author: Johan Silvergrund <johan.silvergrund@hiq.se> Date: Tue Apr 21 14:48:46 2020 +0200 Merge pull request #106 from helsingborg-stad/feasture/slider-btn Slider Buttons commit 99e371b Author: Alexander Boman Skoug <alexanderbomanskoug@gmail.com> Date: Mon Apr 20 13:24:38 2020 +0200 Splitbutton - remove unsued values - add class to buttongroup commit a611775 Author: Alexander Boman Skoug <alexanderbomanskoug@gmail.com> Date: Mon Apr 20 11:00:06 2020 +0200 Slider Buttons - add corrected buttons commit 9fdaa66 Merge: 9c97349 a8d5a40 Author: Muckbuck <rosenborg.eric@gmail.com> Date: Mon Apr 20 10:31:38 2020 +0200 Merge pull request #104 from helsingborg-stad/feature/comments-designfix Rearanged block order, removed var, added parameters commit 9c97349 Merge: 09a4a1d 85e5bbc Author: Johan Silvergrund <johan.silvergrund@hiq.se> Date: Fri Apr 17 13:01:01 2020 +0200 Merge pull request #105 from helsingborg-stad/feature/modal-buttons Modal Buttons commit 85e5bbc Author: Alexander Boman Skoug <alexanderbomanskoug@gmail.com> Date: Thu Apr 16 17:45:44 2020 +0200 Modal Buttons - add corrected buttons commit a8d5a40 Author: Silvergrund <johan.silvergrund@hiq.se> Date: Thu Apr 16 16:47:20 2020 +0200 Rearanged block order, removed var, added parameters commit 09a4a1d Merge: f1998e3 7df8625 Author: Johan Silvergrund <johan.silvergrund@hiq.se> Date: Tue Apr 7 17:13:00 2020 +0200 Merge pull request #102 from helsingborg-stad/feature/signature Signature Component commit f1998e3 Merge: 44b4b24 8000099 Author: Johan Silvergrund <johan.silvergrund@hiq.se> Date: Tue Apr 7 17:11:51 2020 +0200 Merge pull request #100 from helsingborg-stad/feature/component-dependencies Component Sass Dependencies commit 7df8625 Author: Alexander <alexanderbomanskoug@gmail.com> Date: Tue Apr 7 15:24:11 2020 +0200 Signature Component - add signature component blade - add signature component json - add signature component php commit 8000099 Author: Alexander <alexanderbomanskoug@gmail.com> Date: Tue Apr 7 10:34:48 2020 +0200 Component Sass Dependencies - add sass dependencies commit 44b4b24 Author: Silvergrund <johan.silvergrund@hiq.se> Date: Fri Apr 3 13:55:02 2020 +0200 Added icon dependency to accordion
1 parent 132ea53 commit 983444b

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/Component/Slider/slider.blade.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,30 @@
44
</div>
55

66
@button([
7-
'type' => 'basic',
7+
'text' => '',
88
'icon' => 'chevron_left',
9-
'size' => 'md',
10-
'color' => 'primary',
9+
'color' => 'default',
10+
'style' => 'basic',
1111
'attributeList' => ['js-slider-btn' => 'prev'],
1212
'classList' => [
1313
'c-slider__button',
1414
'c-slider__button--prev'
15-
]
15+
],
16+
'label' => 'Slide to previous'
1617
])
1718
@endbutton
1819

1920
@button([
20-
'type' => 'basic',
21+
'text' => '',
2122
'icon' => 'chevron_right',
22-
'size' => 'md',
23-
'color' => 'primary',
23+
'color' => 'default',
24+
'style' => 'basic',
2425
'attributeList' => ['js-slider-btn' => 'next'],
2526
'classList' => [
2627
'c-slider__button',
2728
'c-slider__button--next'
28-
]
29+
],
30+
'label' => 'Slide to previous'
2931
])
3032
@endbutton
3133

src/Component/Splitbutton/splitbutton.blade.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11

2-
@buttonGroup(['attributeList' => ['js-split' => '']])
2+
@buttonGroup([
3+
'borderColor' => 'default',
4+
'attributeList' => ['js-split' => ''],
5+
'classList' => [$class]
6+
])
37
@button(['text' => $buttonText])
48
@endbutton
59
@dropdown([

src/Component/Splitbutton/splitbutton.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
{
22
"slug": "splitbutton",
33
"default": {
4-
"background": "primary",
5-
"borderColor": "primary",
64
"buttonText": "Pick an item",
75
"icon": "arrow-drop-down",
86
"dropdownDirection": "bottom"
97
},
108
"description": {
11-
"background": "Background of the splitbutton.",
12-
"borderColor": "Color of the border around the splitbutton",
139
"buttonText": "The text on the actionbutton",
1410
"icon": "The icon for the dropdown",
1511
"dropdownDirection": "In which direction the dropdown opens"

0 commit comments

Comments
 (0)