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

Commit 132ea53

Browse files
silvergrundsilvergrund
committed
Squashed commit of the following:
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 a8d5057 commit 132ea53

File tree

3 files changed

+30
-39
lines changed

3 files changed

+30
-39
lines changed

‎src/Component/Comment/comment.blade.php

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
<{{$componentElement}} id="{{ $id }}" class="{{ $class }}" href="{{ $href }}" {!! $attribute !!}>
1+
<{{$componentElement}} id="{{ $id }}" class="{{ $class }}" {!! $attribute !!}>
22
<div class="{{$baseClass}}__top">
3-
@avatar([
4-
'name' => $author,
5-
'icon' => [
6-
'name' => $icon,
7-
'size' => 'lg'
8-
],
9-
'image' => $author_image
10-
])
11-
@endavatar
3+
124

135
@if ($author_url)
146
@link([
157
'href' => $author_url,
168
'classList' => ['c-comment__link']
179
])
1810
@endif
19-
11+
2012
@typography([
2113
"variant" => "title",
2214
"element" => "h6",
@@ -28,7 +20,7 @@
2820
@if ($author_url)
2921
@endlink
3022
@endif
31-
23+
3224

3325
@if ($date)
3426
@typography([
@@ -45,7 +37,18 @@
4537
@endif
4638
</div>
4739

48-
<div class="{{$baseClass}}__bubble">
40+
41+
<div class="{{$baseClass}}__bubble {{$baseClass}}__bubble--color-{{$bubble_color}}">
42+
@avatar([
43+
'name' => $author,
44+
'icon' => [
45+
'name' => $icon,
46+
'size' => 'lg'
47+
],
48+
'image' => $author_image
49+
])
50+
@endavatar
51+
4952
@typography([
5053
"variant" => "body",
5154
"element" => "p"

‎src/Component/Comment/comment.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"author_image": "",
77
"text": "",
88
"icon": "",
9-
9+
"bubble_color": "dark",
1010
"date": "01/02/2019",
11+
"date_suffix": "",
1112
"componentElement": "div",
1213
"is_reply": false
1314
},
@@ -17,8 +18,9 @@
1718
"author_image": "A link to an image",
1819
"text": "Content of the comment",
1920
"icon": "Which icon to show",
20-
21+
"bubble_color": "Color for comment bubble background: light or dark",
2122
"date": "The date when the comment was posted",
23+
"date_suffix": "Time elapsed 'since' ",
2224
"componentElement": "Element of the component",
2325
"is_reply": "If true the comment will be displayed as a reply"
2426
},

‎src/Component/Modal/modal.blade.php

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@
1010
{{$heading}}
1111
@endtypography
1212
@endif
13-
13+
1414
@button([
15-
'type' => 'basic',
16-
'href' => '#btn-3',
17-
'type' => 'basic',
15+
'text' => '',
1816
'icon' => 'close',
19-
'size' => 'lg',
20-
'color' => 'secondary',
17+
'color' => 'default',
18+
'style' => 'basic',
2119
'attributeList' => ['data-close' => ''],
2220
'classList' => [$baseClass . "__close"],
23-
'hasRipple' => true
2421
])
2522
@endbutton
2623
</header>
@@ -30,15 +27,10 @@
3027
{{-- Previous button --}}
3128
@if ($navigation)
3229
@button([
33-
'type' => 'basic',
34-
'href' => '#previous',
35-
'isOutlined' => false,
36-
'isIconButton' => true,
30+
'text' => '',
3731
'icon' => 'chevron_left',
38-
'reverseIcon' => false,
39-
'size' => 'md',
40-
'color' => 'secondary',
41-
'floating' => ['animate' => true, 'hover' => true],
32+
'color' => 'default',
33+
'style' => 'basic',
4234
'attributeList' => ['data-prev' => ''],
4335
'classList' => [$baseClass . "__prev"],
4436
'label' => 'Slide to previous'
@@ -52,19 +44,13 @@
5244
{{-- Next button --}}
5345
@if ($navigation)
5446
@button([
55-
'type' => 'basic',
56-
'href' => '#next',
57-
'isOutlined' => false,
58-
'isIconButton' => true,
47+
'text' => '',
5948
'icon' => 'chevron_right',
60-
'reverseIcon' => false,
61-
'size' => 'md',
62-
'color' => 'secondary',
63-
'floating' => ['animate' => true, 'hover' => true],
49+
'color' => 'default',
50+
'style' => 'basic',
6451
'attributeList' => ['data-next' => ''],
6552
'classList' => [$baseClass . "__next"],
6653
'label' => 'Slide to next'
67-
6854
])
6955
@endbutton
7056
@endif

0 commit comments

Comments
 (0)