Skip to content

Commit

Permalink
Merge pull request #891 from helsingborg-stad/chore/remove-button-bac…
Browse files Browse the repository at this point in the history
…kground

chore: remove background params from button
  • Loading branch information
NiclasNorin authored Mar 21, 2024
2 parents e16eac7 + 1006502 commit 4e5abf3
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 115 deletions.
4 changes: 1 addition & 3 deletions views/pages/components/usage/button.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
'href' => 'www.test.com',
'text' => 'Button',
'icon' => ['name' => 'close'],
'background' => 'secondary'
'size' => 'lg',
'reverseIcon' => false,
'floating' => ['animate' => true, 'hover' => true]
Expand All @@ -17,8 +16,7 @@
[
'isIconButton' => true,
'icon' => ['name' => 'close', 'color' => 'black', 'size' => 'md'],
'floating' => ['animate' => true, 'hover' => true],
'background' => false
'floating' => ['animate' => true, 'hover' => true]
]
)
@endbutton
3 changes: 0 additions & 3 deletions views/pages/components/usage/button/background.blade.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
@button([
'background' => 'primary',
'text' => 'Primary bg',
'color' => 'white'
])
@endbutton

@button([
'background' => 'secondary',
'text' => 'Secondary bg',
'color' => 'white'
])
@endbutton

@button([
'background' => 'default',
'text' => 'Default bg'
])
@endbutton
3 changes: 0 additions & 3 deletions views/pages/components/usage/button/floating.blade.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
@button([
'floating' => ['animate' => true, 'hover' => true],
'text' => 'Animate + hover',
'background' => 'default'
])
@endbutton

@button([
'floating' => ['animate' => false, 'hover' => true],
'text' => 'Only hover',
'background' => 'default'
])
@endbutton

@button([
'floating' => ['animate' => false, 'hover' => false],
'text' => 'No hover or animate',
'background' => 'default'
])
@endbutton
2 changes: 0 additions & 2 deletions views/pages/components/usage/button/iconHoverColor.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@button([
'isIconButton' => true,
'icon' => ['name' => 'close', 'color' => 'black', 'size' => 'lg'],
'background' => false,
'hover' => ['color' => 'default']
])
@endbutton
Expand All @@ -16,7 +15,6 @@
@button([
'isIconButton' => true,
'icon' => ['name' => 'close', 'color' => 'black', 'size' => 'lg'],
'background' => false,
'hover' => ['color' => 'secondary']
])
@endbutton
9 changes: 3 additions & 6 deletions views/pages/components/usage/button/size.blade.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
@button([
'color' => 'secondary',
'size' => 'sm',
'text' => 'Size sm',
'background' => 'default'
'text' => 'Size sm'
])
@endbutton

@button([
'color' => 'secondary',
'size' => 'md',
'text' => 'Size md',
'background' => 'default'
'text' => 'Size md'
])
@endbutton

@button([
'color' => 'secondary',
'size' => 'lg',
'text' => 'Size lg',
'background' => 'default'
'text' => 'Size lg'
])
@endbutton
3 changes: 0 additions & 3 deletions views/pages/components/usage/button/sizewithicon.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
'color' => 'secondary',
'size' => 'sm',
'text' => 'Size sm',
'background' => 'default',
'icon' => 'home',
'reversePositions' => 'true'
])
Expand All @@ -12,7 +11,6 @@
'color' => 'secondary',
'size' => 'md',
'text' => 'Size md',
'background' => 'default',
'icon' => 'home',
'reversePositions' => 'true'
])
Expand All @@ -22,7 +20,6 @@
'color' => 'secondary',
'size' => 'lg',
'text' => 'Size lg',
'background' => 'default',
'icon' => 'home',
'reversePositions' => 'true'
])
Expand Down
1 change: 0 additions & 1 deletion views/pages/components/usage/fab.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
])

@button([
'background' => 'primary',
'text' => 'Primary bg',
'color' => 'white'
])
Expand Down
18 changes: 6 additions & 12 deletions views/pages/components/usage/group/alignContent.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'start',
'background' => 'default'
'text' => 'start'
])
@endbutton

@button([
'color' => 'primary',
'size' => 'md',
'text' => 'start',
'background' => 'default'
'text' => 'start'
])
@endbutton

Expand All @@ -35,16 +33,14 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'center',
'background' => 'default'
'text' => 'center'
])
@endbutton

@button([
'color' => 'primary',
'size' => 'md',
'text' => 'center',
'background' => 'default'
'text' => 'center'
])
@endbutton

Expand All @@ -61,16 +57,14 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'end',
'background' => 'default'
'text' => 'end'
])
@endbutton

@button([
'color' => 'primary',
'size' => 'md',
'text' => 'end',
'background' => 'default'
'text' => 'end'
])
@endbutton

Expand Down
9 changes: 3 additions & 6 deletions views/pages/components/usage/group/alignItems.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'start',
'background' => 'default'
'text' => 'start'
])
@endbutton
<div style="height:200px; width:100%; background-color: #e5e5e5;">
Expand All @@ -20,8 +19,7 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'center',
'background' => 'default'
'text' => 'center'
])
@endbutton
<div style="height:200px; width:100%; background-color: #e5e5e5;">
Expand All @@ -37,8 +35,7 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'end',
'background' => 'default'
'text' => 'end'
])
@endbutton
<div style="height:200px; width:100%; background-color: #e5e5e5;">
Expand Down
12 changes: 4 additions & 8 deletions views/pages/components/usage/group/flex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'flex',
'background' => 'default'
'text' => 'flex'
])
@endbutton

@button([
'color' => 'primary',
'size' => 'md',
'text' => 'flex',
'background' => 'default'
'text' => 'flex'
])
@endbutton

Expand All @@ -33,16 +31,14 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'inline-flex',
'background' => 'default'
'text' => 'inline-flex'
])
@endbutton

@button([
'color' => 'primary',
'size' => 'md',
'text' => 'inline-flex',
'background' => 'default'
'text' => 'inline-flex'
])
@endbutton

Expand Down
6 changes: 2 additions & 4 deletions views/pages/components/usage/group/flexGrow.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'flex-grow',
'background' => 'default'
'text' => 'flex-grow'
])
@endbutton
@endgroup
Expand All @@ -20,8 +19,7 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'no flex-grow',
'background' => 'default'
'text' => 'no flex-grow'
])
@endbutton
@endgroup
4 changes: 1 addition & 3 deletions views/pages/components/usage/group/flexShrink.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'flex shrink',
'background' => 'default'
'text' => 'flex shrink'
])
@endbutton
@endgroup
Expand All @@ -20,7 +19,6 @@
'color' => 'primary',
'size' => 'md',
'text' => 'no flex-shrink',
'background' => 'default',
'attributeList' => [
'style' => 'width:300px;max-width:unset;'
]
Expand Down
6 changes: 2 additions & 4 deletions views/pages/components/usage/group/horizontal.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'Search',
'background' => 'default'
'text' => 'Search'
])
@endbutton
@button([
'color' => 'primary',
'size' => 'md',
'text' => 'Search',
'background' => 'default'
'text' => 'Search'
])
@endbutton

Expand Down
Loading

0 comments on commit 4e5abf3

Please sign in to comment.