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

Commit 9899959

Browse files
silvergrundsilvergrund
committed
Squashed commit of the following:
commit c136d47f4fcc8a5d5b4f2ef77281a947f6cfefba Merge: 34fe234 1070dd5 Author: Johan Silvergrund <[email protected]> Date: Tue Mar 24 13:06:26 2020 +0100 Merge pull request #95 from helsingborg-stad/feature/comment-author Feature/comment author commit 1070dd518580868a97c5c29448dbae981ac6ce63 Author: Alexander <[email protected]> Date: Tue Mar 24 11:10:39 2020 +0100 Comment Author - add author link - add updated jsoComment Author - add author link - add updated json commit 0519dda9819e9aff5d53792d31b678eb4810d67d Merge: f253701 34fe234 Author: Alexander <[email protected]> Date: Fri Mar 20 15:59:42 2020 +0100 Merge branch 'develop' of https://github.com/helsingborg-stad/blade-component-library into develop commit 34fe234500af67233f51e2687c22776d61b9e045 Merge: c85286a 1c167be Author: Johan Silvergrund <[email protected]> Date: Fri Mar 20 13:55:29 2020 +0100 Merge pull request #94 from helsingborg-stad/feature/linux-supported-naming Feature/linux supported naming commit f253701cfb3ab9c60fe3225af8152b1891f5fbc6 Merge: 0790650 c85286a Author: Alexander <[email protected]> Date: Thu Mar 19 14:32:48 2020 +0100 Merge branch 'develop' of https://github.com/helsingborg-stad/blade-component-library into develop commit 07906507f5b8671497862767e71e6da21dd83e95 Author: Alexander <[email protected]> Date: Thu Mar 19 14:24:13 2020 +0100 Hotfix: add corrected naming to support linux commit c85286a676024dc8ee51a86862cb11f2b7a56fae Author: Alexander <[email protected]> Date: Thu Mar 19 14:21:51 2020 +0100 Hotfix: add corrected naming to support linux commit 1c167bee0ef4d7989a1a03ccc4db64f44ac8f62b Author: Alexander <[email protected]> Date: Thu Mar 19 09:58:08 2020 +0100 add corrections to splitbutton to load in linux commit 650436daa7c9cc644dfd4a04af930232a36d45d7 Author: Alexander <[email protected]> Date: Thu Mar 19 09:16:21 2020 +0100 add renaming of include as it broke in linux commit 7fa8112649192dab63d21a5cf02bf20de65c56a1 Author: Alexander <[email protected]> Date: Thu Mar 19 09:15:54 2020 +0100 add renaming of include as it broke in linux commit 7acb0e852b5d4b5bbbe0af29b8e19d711a62bf00 Author: Eric Rosenborg <[email protected]> Date: Mon Mar 16 09:59:25 2020 +0100 Remove old config parameters from buttons in splitbutton commit 22bd268f96430ff60d328cf2d22291281f1d818e Author: Silvergrund <[email protected]> Date: Thu Mar 12 16:45:36 2020 +0100 card button parameter style commit f3e8f71484f4521d2413ef59c08ad65750b0d3b4 Author: Silvergrund <[email protected]> Date: Thu Mar 12 16:37:47 2020 +0100 doc commit 40582611496f9e3fcf21e895fb327f0a9e3e8f0a Merge: 9968696 08c66a9 Author: Johan Silvergrund <[email protected]> Date: Thu Mar 12 16:15:21 2020 +0100 Merge pull request #93 from helsingborg-stad/feature/button-type Feature/button type commit 99686961cb65cb072a7cce08706d1ed7b8836650 Author: Alexander Boman Skoug <[email protected]> Date: Thu Mar 12 14:34:08 2020 +0100 Hotfix: add missed function call commit 08c66a99000c07a4048340144ab0ef0729850a4b Author: Alexander Boman Skoug <[email protected]> Date: Thu Mar 12 14:01:05 2020 +0100 Add json values commit 1e2326e0360b278a1c3c5285052483c3184d0fe9 Author: Alexander Boman Skoug <[email protected]> Date: Thu Mar 12 13:55:06 2020 +0100 Button Type - add button type - add button type default commit 47faf9708d7c1d9c821530b6b3195b41477239b2 Author: Alexander Boman Skoug <[email protected]> Date: Thu Mar 12 11:07:52 2020 +0100 Hotfix: Renamed logotype controller commit 7f0dbc257d5e34f35688d01bdd9485ca2d1c83d5 Author: Alexander Boman Skoug <[email protected]> Date: Thu Mar 12 10:17:29 2020 +0100 Hotfix: remove color on icon comp in notice as it created conflicts in design commit 53080807e964996ca6dbabfe0ce56370fabf66a6 Merge: 1af55e6 f29ee41 Author: Johan Silvergrund <[email protected]> Date: Wed Mar 11 15:15:02 2020 +0100 Merge pull request #92 from helsingborg-stad/feature/code-block-design Code Block Design commit 1af55e6dcc17b2b733ec5d0f3ea9c3876f463462 Merge: 78ee362 f632962 Author: Johan Silvergrund <[email protected]> Date: Wed Mar 11 15:14:29 2020 +0100 Merge pull request #90 from helsingborg-stad/feature/card-minor Minor fixes to card commit 78ee36231304fc5ab804712b32e0b6499e5852f9 Author: Alexander Boman Skoug <[email protected]> Date: Wed Mar 11 13:35:40 2020 +0100 Hotfix: Removed hero component commit 36e3105012053b85912f746e179612efcd6f6dc0 Author: Alexander Boman Skoug <[email protected]> Date: Tue Mar 10 13:54:18 2020 +0100 Hotfix: Removed heading related things commit f29ee41b468f1db32ccf58afa1d082e2488c4b67 Author: Alexander Boman Skoug <[email protected]> Date: Mon Mar 9 16:14:55 2020 +0100 Code Block Design - add corrected layout commit 83e9edf978ee2f9fe46bc1bad642133787f82e6d Merge: be84695 bf9bd5e Author: Muckbuck <[email protected]> Date: Thu Mar 5 15:06:58 2020 +0100 Merge pull request #91 from helsingborg-stad/feature/grid-comp-more Grid Component commit bf9bd5eb40ef007ae3871078489e8baa1639aab1 Author: Alexander Boman Skoug <[email protected]> Date: Thu Mar 5 10:12:12 2020 +0100 Grid Component - add controller for new options - add default commit be8469519043eae26553c9a82935382f575e7175 Merge: 8f6c681 bad9c3a Author: Muckbuck <[email protected]> Date: Wed Mar 4 12:16:19 2020 +0100 Merge pull request #89 from helsingborg-stad/feature/grid-comp Grid Component commit f632962a08c84b1d7cd554a5d6dc02ca877e01dd Author: Alexander Boman Skoug <[email protected]> Date: Wed Mar 4 11:08:14 2020 +0100 Minor fixes to card commit bad9c3a23b0edaeaa0db24124fe34f1febbe0fc5 Author: Alexander Boman Skoug <[email protected]> Date: Tue Mar 3 14:46:14 2020 +0100 Grid Component - add grid component - add grid comp json - add grid comp blade commit 8f6c681c55955c6925783bcab20d4d4a94c9db69 Author: Silvergrund <[email protected]> Date: Fri Feb 28 17:14:36 2020 +0100 Squashed commit of the following: commit 0c1f2a2b0f14a8e30c46b6f3631adcd0e2fed238 Author: Silvergrund <[email protected]> Date: Fri Feb 28 17:14:06 2020 +0100 Segments - fix commit 771998d9f5c1b834f37aa06aea50e95b0a8fc8a5 Merge: 9d432fd 9c72c14 Author: Silvergrund <[email protected]> Date: Fri Feb 28 15:04:04 2020 +0100 Merge branch 'develop' commit 9d432fde1fa28c4393bfbb9d8f99cd3f9dd5b28b Author: Silvergrund <[email protected]> Date: Fri Feb 28 14:41:56 2020 +0100 Squashed commit of the following: commit 9c72c147b91daf09e14e669c35dd691fe56d66dc Author: Alexander Boman Skoug <[email protected]> Date: Wed Feb 26 13:56:47 2020 +0100 Segment Version 2 (#87) - add new markup - add new structure - remove old structure commit e075dc7f2337d9ac616aee6143468a9baf51a214 Merge: bbb9e7c 0ac0fc8 Author: Silvergrund <[email protected]> Date: Wed Feb 26 10:54:42 2020 +0100 Merge remote-tracking branch 'origin/develop' commit bbb9e7cbe7d7c979529f63545b54adec34729b70 Merge: bdfcb25 987a44f Author: Sebastian Thulin <[email protected]> Date: Tue Feb 11 15:14:20 2020 +0100 Merge branch 'develop' commit bdfcb25a2a5c0306038230be3aafe3ef9197d5d2 Author: Silvergrund <[email protected]> Date: Tue Feb 11 12:04:41 2020 +0100 Squashed commit of the following: commit 987a44f3b8fdc49a08e7c03f655bdeda65a933df Author: Silvergrund <[email protected]> Date: Tue Feb 11 12:03:11 2020 +0100 Squashed commit of the following: commit 11b1f16c9b384f386d56e323f591d80c9a780f89 Author: Silvergrund <[email protected]> Date: Mon Feb 3 15:07:37 2020 +0100 Squashed commit of the following: commit ffd62a8a3238eeeacaadc6e5482047673b260c55 Author: Silvergrund <[email protected]> Date: Mon Feb 3 14:01:30 2020 +0100 removed base_convert for ids commit 2b00fa8219b20ece0f2931adbfcf8d0c3a3b27ab Merge: 0a1fdfc af7b0c7 Author: Alexander Boman Skoug <[email protected]> Date: Fri Jan 31 12:34:27 2020 +0100 Merge pull request #80 from helsingborg-stad/feature/Scss_split_component Feature/scss split component commit af7b0c74bbec8c345db867017232542fb395f312 Author: Silvergrund <[email protected]> Date: Fri Jan 31 11:06:09 2020 +0100 Squashed commit of the following: commit 0a1fdfc1d5656281766e1ca3f0dc97519be36ca1 Merge: eac85c1 d1d0d0c Author: Muckbuck <[email protected]> Date: Thu Jan 30 11:28:44 2020 +0100 Merge pull request #78 from helsingborg-stad/feature/tags Documentated commit eac85c1832374f9d9115859cb688a6a40a09b351 Merge: e267ce2 8cc8e9b Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 14:53:55 2020 +0100 Merge pull request #79 from helsingborg-stad/feature/button-doc Update parameter list commit d1d0d0c340c3530577dc519d3353bb010560514e Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 12:04:02 2020 +0100 Documentated commit e267ce2115de6f7e8cc464554ec32ad42f752b20 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 10:54:34 2020 +0100 Hot fix: Removed unnecessary element commit 8cc8e9b7983d1cda0b1d134aa83891f85200e3dc Author: Eric Rosenborg <[email protected]> Date: Tue Jan 28 10:40:16 2020 +0100 Update parameter list commit de948379cf093d2761888d0bb3945373e76dbbab Merge: 0fbac19 2afa409 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 16:09:05 2020 +0100 Merge pull request #76 from helsingborg-stad/feature/calendar Calendar component commit 0fbac19fdf3e31d667f41cb33c8f3b2b293a90cc Merge: fcec1f3 56fc66c Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:03:01 2020 +0100 Merge pull request #75 from helsingborg-stad/feature/tiles Tiles commit fcec1f3a2db5e7270bdd3bc3caec4d81339616c3 Merge: 28bf190 fd075b5 Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:02:41 2020 +0100 Merge pull request #74 from helsingborg-stad/feature/segment-improve Feature/segment improve commit 56fc66c83dcf9b793d4c2ab0889f42e086133a0f Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 15:41:57 2020 +0100 Requested changes commit 2afa40984fbe00d86c0897ec3023da550992c45c Author: Eric Rosenborg <[email protected]> Date: Wed Jan 22 13:35:04 2020 +0100 Calendar component Add calendar component commit 66a9f09cc162e446f6880a2d207db4c26f06b632 Author: Alexander Boman Skoug <[email protected]> Date: Tue Jan 21 16:39:20 2020 +0100 Tiles - Add tiles commit fd075b59c3bd29d7578ea98820b99f50aee884be Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 16:10:42 2020 +0100 post-commit clean up commit a0703bc01c94424e649df12e77e143919315793d Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 15:05:45 2020 +0100 Added cta align commit aedd4d50086e5048c2d7aa8c6b3a4b2308fce165 Author: Silvergrund <[email protected]> Date: Fri Jan 31 11:05:22 2020 +0100 Loader commit 0a1fdfc1d5656281766e1ca3f0dc97519be36ca1 Merge: eac85c1 d1d0d0c Author: Muckbuck <[email protected]> Date: Thu Jan 30 11:28:44 2020 +0100 Merge pull request #78 from helsingborg-stad/feature/tags Documentated commit eac85c1832374f9d9115859cb688a6a40a09b351 Merge: e267ce2 8cc8e9b Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 14:53:55 2020 +0100 Merge pull request #79 from helsingborg-stad/feature/button-doc Update parameter list commit 2b9ea296059a718b87d5e9668c994976e79fe1ee Author: Silvergrund <[email protected]> Date: Wed Jan 29 14:18:37 2020 +0100 options value commit d1d0d0c340c3530577dc519d3353bb010560514e Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 12:04:02 2020 +0100 Documentated commit e267ce2115de6f7e8cc464554ec32ad42f752b20 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 10:54:34 2020 +0100 Hot fix: Removed unnecessary element commit 8cc8e9b7983d1cda0b1d134aa83891f85200e3dc Author: Eric Rosenborg <[email protected]> Date: Tue Jan 28 10:40:16 2020 +0100 Update parameter list commit 37caac12b0fb6171f7148514d35c3cc639196b10 Author: Silvergrund <[email protected]> Date: Thu Jan 23 15:00:08 2020 +0100 SplitButton commit 275540dbed3d1b8c6bc78562401665203baf90c0 Author: Silvergrund <[email protected]> Date: Thu Jan 23 14:58:59 2020 +0100 splitbutton commit 2e14993e22ad3d32e1f427b0062990c70f7167f2 Author: Silvergrund <[email protected]> Date: Thu Jan 23 14:57:19 2020 +0100 json component dependency commit de948379cf093d2761888d0bb3945373e76dbbab Merge: 0fbac19 2afa409 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 16:09:05 2020 +0100 Merge pull request #76 from helsingborg-stad/feature/calendar Calendar component commit 0fbac19fdf3e31d667f41cb33c8f3b2b293a90cc Merge: fcec1f3 56fc66c Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:03:01 2020 +0100 Merge pull request #75 from helsingborg-stad/feature/tiles Tiles commit fcec1f3a2db5e7270bdd3bc3caec4d81339616c3 Merge: 28bf190 fd075b5 Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:02:41 2020 +0100 Merge pull request #74 from helsingborg-stad/feature/segment-improve Feature/segment improve commit 56fc66c83dcf9b793d4c2ab0889f42e086133a0f Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 15:41:57 2020 +0100 Requested changes commit 2afa40984fbe00d86c0897ec3023da550992c45c Author: Eric Rosenborg <[email protected]> Date: Wed Jan 22 13:35:04 2020 +0100 Calendar component Add calendar component commit 66a9f09cc162e446f6880a2d207db4c26f06b632 Author: Alexander Boman Skoug <[email protected]> Date: Tue Jan 21 16:39:20 2020 +0100 Tiles - Add tiles commit 28bf190841c0999276f020a22402e00e56fa0e66 Author: Silvergrund <[email protected]> Date: Tue Jan 21 11:35:48 2020 +0100 Refactor name fileinput commit fd075b59c3bd29d7578ea98820b99f50aee884be Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 16:10:42 2020 +0100 post-commit clean up commit a0703bc01c94424e649df12e77e143919315793d Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 15:05:45 2020 +0100 Added cta align commit 3a9c8cf510f3666381b717bcd2e7cae70de4418f Author: Silvergrund <[email protected]> Date: Mon Feb 3 15:05:19 2020 +0100 MErge commit 6fbdc5935c9b8eab68a7d925a2acfbe3dc442c9f Author: Silvergrund <[email protected]> Date: Mon Feb 3 15:04:53 2020 +0100 Squashed commit of the following: commit ffd62a8a3238eeeacaadc6e5482047673b260c55 Author: Silvergrund <[email protected]> Date: Mon Feb 3 14:01:30 2020 +0100 removed base_convert for ids commit 2b00fa8219b20ece0f2931adbfcf8d0c3a3b27ab Merge: 0a1fdfc af7b0c7 Author: Alexander Boman Skoug <[email protected]> Date: Fri Jan 31 12:34:27 2020 +0100 Merge pull request #80 from helsingborg-stad/feature/Scss_split_component Feature/scss split component commit af7b0c74bbec8c345db867017232542fb395f312 Author: Silvergrund <[email protected]> Date: Fri Jan 31 11:06:09 2020 +0100 Squashed commit of the following: commit 0a1fdfc1d5656281766e1ca3f0dc97519be36ca1 Merge: eac85c1 d1d0d0c Author: Muckbuck <[email protected]> Date: Thu Jan 30 11:28:44 2020 +0100 Merge pull request #78 from helsingborg-stad/feature/tags Documentated commit eac85c1832374f9d9115859cb688a6a40a09b351 Merge: e267ce2 8cc8e9b Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 14:53:55 2020 +0100 Merge pull request #79 from helsingborg-stad/feature/button-doc Update parameter list commit d1d0d0c340c3530577dc519d3353bb010560514e Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 12:04:02 2020 +0100 Documentated commit e267ce2115de6f7e8cc464554ec32ad42f752b20 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 10:54:34 2020 +0100 Hot fix: Removed unnecessary element commit 8cc8e9b7983d1cda0b1d134aa83891f85200e3dc Author: Eric Rosenborg <[email protected]> Date: Tue Jan 28 10:40:16 2020 +0100 Update parameter list commit de948379cf093d2761888d0bb3945373e76dbbab Merge: 0fbac19 2afa409 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 16:09:05 2020 +0100 Merge pull request #76 from helsingborg-stad/feature/calendar Calendar component commit 0fbac19fdf3e31d667f41cb33c8f3b2b293a90cc Merge: fcec1f3 56fc66c Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:03:01 2020 +0100 Merge pull request #75 from helsingborg-stad/feature/tiles Tiles commit fcec1f3a2db5e7270bdd3bc3caec4d81339616c3 Merge: 28bf190 fd075b5 Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:02:41 2020 +0100 Merge pull request #74 from helsingborg-stad/feature/segment-improve Feature/segment improve commit 56fc66c83dcf9b793d4c2ab0889f42e086133a0f Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 15:41:57 2020 +0100 Requested changes commit 2afa40984fbe00d86c0897ec3023da550992c45c Author: Eric Rosenborg <[email protected]> Date: Wed Jan 22 13:35:04 2020 +0100 Calendar component Add calendar component commit 66a9f09cc162e446f6880a2d207db4c26f06b632 Author: Alexander Boman Skoug <[email protected]> Date: Tue Jan 21 16:39:20 2020 +0100 Tiles - Add tiles commit fd075b59c3bd29d7578ea98820b99f50aee884be Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 16:10:42 2020 +0100 post-commit clean up commit a0703bc01c94424e649df12e77e143919315793d Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 15:05:45 2020 +0100 Added cta align commit aedd4d50086e5048c2d7aa8c6b3a4b2308fce165 Author: Silvergrund <[email protected]> Date: Fri Jan 31 11:05:22 2020 +0100 Loader commit 0a1fdfc1d5656281766e1ca3f0dc97519be36ca1 Merge: eac85c1 d1d0d0c Author: Muckbuck <[email protected]> Date: Thu Jan 30 11:28:44 2020 +0100 Merge pull request #78 from helsingborg-stad/feature/tags Documentated commit eac85c1832374f9d9115859cb688a6a40a09b351 Merge: e267ce2 8cc8e9b Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 14:53:55 2020 +0100 Merge pull request #79 from helsingborg-stad/feature/button-doc Update parameter list commit 2b9ea296059a718b87d5e9668c994976e79fe1ee Author: Silvergrund <[email protected]> Date: Wed Jan 29 14:18:37 2020 +0100 options value commit d1d0d0c340c3530577dc519d3353bb010560514e Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 12:04:02 2020 +0100 Documentated commit e267ce2115de6f7e8cc464554ec32ad42f752b20 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 29 10:54:34 2020 +0100 Hot fix: Removed unnecessary element commit 8cc8e9b7983d1cda0b1d134aa83891f85200e3dc Author: Eric Rosenborg <[email protected]> Date: Tue Jan 28 10:40:16 2020 +0100 Update parameter list commit 37caac12b0fb6171f7148514d35c3cc639196b10 Author: Silvergrund <[email protected]> Date: Thu Jan 23 15:00:08 2020 +0100 SplitButton commit 275540dbed3d1b8c6bc78562401665203baf90c0 Author: Silvergrund <[email protected]> Date: Thu Jan 23 14:58:59 2020 +0100 splitbutton commit 2e14993e22ad3d32e1f427b0062990c70f7167f2 Author: Silvergrund <[email protected]> Date: Thu Jan 23 14:57:19 2020 +0100 json component dependency commit de948379cf093d2761888d0bb3945373e76dbbab Merge: 0fbac19 2afa409 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 16:09:05 2020 +0100 Merge pull request #76 from helsingborg-stad/feature/calendar Calendar component commit 0fbac19fdf3e31d667f41cb33c8f3b2b293a90cc Merge: fcec1f3 56fc66c Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:03:01 2020 +0100 Merge pull request #75 from helsingborg-stad/feature/tiles Tiles commit fcec1f3a2db5e7270bdd3bc3caec4d81339616c3 Merge: 28bf190 fd075b5 Author: Muckbuck <[email protected]> Date: Wed Jan 22 16:02:41 2020 +0100 Merge pull request #74 from helsingborg-stad/feature/segment-improve Feature/segment improve commit 56fc66c83dcf9b793d4c2ab0889f42e086133a0f Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 22 15:41:57 2020 +0100 Requested changes commit 2afa40984fbe00d86c0897ec3023da550992c45c Author: Eric Rosenborg <[email protected]> Date: Wed Jan 22 13:35:04 2020 +0100 Calendar component Add calendar component commit 66a9f09cc162e446f6880a2d207db4c26f06b632 Author: Alexander Boman Skoug <[email protected]> Date: Tue Jan 21 16:39:20 2020 +0100 Tiles - Add tiles commit 28bf190841c0999276f020a22402e00e56fa0e66 Author: Silvergrund <[email protected]> Date: Tue Jan 21 11:35:48 2020 +0100 Refactor name fileinput commit fd075b59c3bd29d7578ea98820b99f50aee884be Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 16:10:42 2020 +0100 post-commit clean up commit a0703bc01c94424e649df12e77e143919315793d Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 20 15:05:45 2020 +0100 Added cta align commit 380473de3cd69cbc12d130fddfdd306e13646961 Author: Silvergrund <[email protected]> Date: Tue Jan 21 11:36:26 2020 +0100 Squashed commit of the following: commit 28bf190841c0999276f020a22402e00e56fa0e66 Author: Silvergrund <[email protected]> Date: Tue Jan 21 11:35:48 2020 +0100 Refactor name fileinput commit a4fa5a3f3847f5c8fa4ba2423a3657fb89f19ebc Merge: 6f3dc0e 0e0b5d3 Author: Silvergrund <[email protected]> Date: Thu Jan 16 13:32:23 2020 +0100 Merge remote-tracking branch 'origin/develop' commit 6f3dc0e18d3c811116cc04840b361f22e864c28b Author: Silvergrund <[email protected]> Date: Thu Jan 16 11:54:25 2020 +0100 Squashed commit of the following: commit 0e0b5d391d19381f75394300f3ab278db657222f Merge: 3ccf187 6c055dc Author: Alexander Boman Skoug <[email protected]> Date: Thu Jan 16 11:50:29 2020 +0100 Merge pull request #73 from helsingborg-stad/feature/gallery-buttons-fix gallery - buttons commit 6c055dc0b09b775ccbffe9e13786900a2b640ff3 Author: Silvergrund <[email protected]> Date: Thu Jan 16 11:39:06 2020 +0100 gallery - buttons commit 3ccf1876b9b2c32b7a75765510251aa4e058dd1f Merge: 487bd6f 808598e Author: Johan Silvergrund <[email protected]> Date: Thu Jan 16 10:36:07 2020 +0100 Merge pull request #70 from helsingborg-stad/feature/slider-improve Slider commit 487bd6fe495a120da2a7748af29d59c8fcdd2cac Merge: 9506cdc fb80924 Author: Johan Silvergrund <[email protected]> Date: Thu Jan 16 10:34:42 2020 +0100 Merge pull request #71 from helsingborg-stad/feature/tags Tags commit 9506cdcfe9354e84dcdbbb09a57ea65e838377ee Merge: 3d9acb0 52082ee Author: Muckbuck <[email protected]> Date: Thu Jan 16 10:33:42 2020 +0100 Merge pull request #72 from helsingborg-stad/feature/date Date commit 52082ee28255ef09377b08db8637ffe34e6e5c88 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 15 14:42:00 2020 +0100 Date - Add format timestamp to date commit fb80924da3d72090d32b0fdff4f86591e7de7404 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 15 12:50:41 2020 +0100 Tags - add controller for empty fields commit 808598ef55dcbb9ede296f095282d912d7d8025e Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 15 10:30:54 2020 +0100 - add corrected buttons commit f94536f064748362ce0a82e051262e5facb72f85 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 15 08:50:31 2020 +0100 Slider - add stepper is optional - add correct config commit 3d9acb0ea64f3e0e5a1a739073dcf344dcb5abe7 Merge: e87fe72 3034952 Author: Johan Silvergrund <[email protected]> Date: Tue Jan 14 15:19:04 2020 +0100 Merge pull request #69 from helsingborg-stad/feature/slider Slider commit 30349522f5e931108c6223429cbb379064d7b981 Author: Alexander Boman Skoug <[email protected]> Date: Tue Jan 14 15:16:07 2020 +0100 adapted for new buttons commit dda25aff77fa7818c7bffc149bebd0371e9d3c3a Author: Alexander Boman Skoug <[email protected]> Date: Tue Jan 14 14:05:50 2020 +0100 Slider - add slider component commit e87fe722eb7cc98df3180895eed0789273aee0d5 Merge: a3508b9 03d74c6 Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 13 13:37:23 2020 +0100 Merge pull request #68 from helsingborg-stad/feature/card-doc-button-fix Card doc button fix commit 03d74c6fb9e8176af6f8d1cee9b23a1e4c1e6d64 Author: Eric Rosenborg <[email protected]> Date: Mon Jan 13 13:13:35 2020 +0100 Card doc button fix General fixes for buttons in card doc. Toggle fix. commit a3508b9303fa259de9720c86b358befe640b4c22 Merge: f2dd382 3c119e7 Author: Alexander Boman Skoug <[email protected]> Date: Mon Jan 13 11:54:00 2020 +0100 Merge pull request #67 from helsingborg-stad/feature/notification Notification commit f2dd382c636c7d5107f7f28dead104bff31f9ad2 Merge: 25d1ae2 935644e Author: Silvergrund <[email protected]> Date: Mon Jan 13 11:29:05 2020 +0100 Merge branch 'develop' of github.com:helsingborg-stad/blade-component-library into develop commit 25d1ae20588b750f21d25f70d0d2ce6eb090418e Author: Silvergrund <[email protected]> Date: Mon Jan 13 11:20:36 2020 +0100 fileinput commit 935644e0a8bf0709c4dca5984500228a230ed9d7 Merge: 2d6fc8d 841255e Author: Muckbuck <[email protected]> Date: Mon Jan 13 10:40:14 2020 +0100 Merge pull request #65 from helsingborg-stad/feature/comment Comment & Date commit 3c119e7c0d9d0d1006497203d05b142bb28bd503 Author: Eric Rosenborg <[email protected]> Date: Fri Jan 10 13:28:00 2020 +0100 Notification A container for the notice component with the ability to set give it an animation. - Notice - Remove parameters: isNotice, isSuccess, isWarning, isDanger - Add parameter type which replaces the above parameters. - Notification - Animation parameter of type Array with direction and onPageLoad parameters - onPageLoad: run the animation directly on page load - direction: from which direction the animation should start commit 841255e7d1b03e4201d8ef4fa09d43bd73a0d7d6 Author: Alexander Boman Skoug <[email protected]> Date: Fri Jan 10 12:39:33 2020 +0100 Suggested changes done commit 2d6fc8d07893cc3004d8f050ae4f0e196a382950 Merge: 28db1f6 26075ab Author: Muckbuck <[email protected]> Date: Fri Jan 10 10:14:36 2020 +0100 Merge pull request #56 from helsingborg-stad/featue/navbar-refactor Navbar - Refactor commit 28db1f684f11a5447001edd3ceda501fd5fdb6c0 Merge: 7f89251 68d36ee Author: Alexander Boman Skoug <[email protected]> Date: Fri Jan 10 10:02:47 2020 +0100 Merge pull request #66 from helsingborg-stad/feature/button-component-rework A complete rework of buttons. commit 68d36ee65429a81a1819f3baea0c558934111dd0 Author: Eric Rosenborg <[email protected]> Date: Thu Jan 9 15:35:56 2020 +0100 A complete rework of buttons. An attempt at making the configuration of buttons make more sense without any type-specific parameters. - Types - Basic, no background or border, only text - Outlined, border and text have same color - Filled, border and background - Toggle - If set to true default styling will be applied - If aria-pressed, the text color will be set to primary - Size - Regular, nothing new - Icons get specific sizes for both button and text - Floating buttons are now deleted - Icon hover color is also a thing of the past commit 7f8925178656aafccc07946828e2569409d674ea Merge: 4d9ab6a c188a43 Author: Alexander Boman Skoug <[email protected]> Date: Thu Jan 9 14:40:59 2020 +0100 Merge pull request #64 from helsingborg-stad/feature/option Feature/option commit c188a43a40ab2bfeee4b6a98ccb373e70087e636 Author: Silvergrund <[email protected]> Date: Thu Jan 9 13:47:04 2020 +0100 Option commit 26075ab0c4e1c5e86a5983e6a7ee97523891e636 Author: Alexander Boman Skoug <[email protected]> Date: Thu Jan 9 13:45:39 2020 +0100 Fixed suggested changes commit 1a5c80f8ed7d8c1b35e9f700f8b4460c71e1c049 Author: Alexander Boman Skoug <[email protected]> Date: Thu Jan 9 11:31:58 2020 +0100 Comment & Date - Add Comment Component - Add Date Component commit 67506f396197224c7c10b30577bc4b05640edebe Author: Silvergrund <[email protected]> Date: Wed Jan 8 15:58:21 2020 +0100 textarea component commit 8a6752735b2c7b214cdeff3877a7def2ef5b1f3b Author: Silvergrund <[email protected]> Date: Wed Jan 8 11:41:32 2020 +0100 Textarea commit a94e9a0737063854b69dfa7777d4c583f8b704de Merge: a6e3eb8 4d9ab6a Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 8 11:21:34 2020 +0100 Merge branch 'develop' into featue/navbar-refactor commit 4d9ab6ab6bc01d5396decc236651242e5c3768e0 Merge: ec7ef57 fcee041 Author: Alexander Boman Skoug <[email protected]> Date: Wed Jan 8 09:42:53 2020 +0100 Merge pull request #62 from helsingborg-stad/feature/component-form Feature/component form commit fcee041903131be4b188fc217756aba9ab1643d8 Author: Silvergrund <[email protected]> Date: Tue Jan 7 15:10:55 2020 +0100 Less markup commit 999d4eb7fa4374004cb9101e2cbc239a89b44309 Author: Silvergrund <[email protected]> Date: Tue Jan 7 15:08:28 2020 +0100 forms commit c4ce4db4410e9289a90b4f9556478d5bae23d45d Author: Silvergrund <[email protected]> Date: Tue Jan 7 14:36:04 2020 +0100 form commit f696b95953b4145338fba8b8c845d39187905aae Author: Silvergrund <[email protected]> Date: Tue Jan 7 14:29:41 2020 +0100 form commit 820b54d2323986c59635f7bc269665f41f7964ef Author: Silvergrund <[email protected]> Date: Tue Jan 7 12:57:56 2020 +0100 Moved color picker and range slider to fields from form commit ec7ef5757c423b19e695ea6a12467809505714ee Merge: dc491e5 179a5bf Author: Johan Silvergrund <[email protected]> Date: Fri Dec 20 13:23:07 2019 +0100 Merge pull request #61 from helsingborg-stad/feature/datepicker Datepicker commit 179a5bf4e533e2a8ef9a3e78dc9495b4d31cd813 Author: Alexander Boman Skoug <[email protected]> Date: Thu Dec 19 15:33:16 2019 +0100 Datepicker - Add datepicker to field controller - Add datepicker example commit dc491e5e4ff88ae57fc54f015c3466c45513f8f8 Merge: a1063a5 a60673f Author: Alexander Boman Skoug <[email protected]> Date: Thu Dec 19 10:50:33 2019 +0100 Merge pull request #60 from helsingborg-stad/feature/card-button-usage-refactor Card doc refactor commit a60673f7f10fa3be82a3cc5f35f3d9d68d51a8d8 Author: Silvergrund <[email protected]> Date: Thu Dec 19 10:26:35 2019 +0100 Card doc refactor commit a1063a5e734dd9a528ca5677ef9f5bf306766856 Merge: 23ad264 8e846a0 Author: Alexander Boman Skoug <[email protected]> Date: Mon Dec 16 16:10:53 2019 +0100 Merge pull request #58 from helsingborg-stad/feature/button-controller-cleanup Refactor button controller to use methods, add some default values, r… commit 8e846a0076870967afe10f8dc0964207aa3a5c5f Author: Eric Rosenborg <[email protected]> Date: Mon Dec 16 12:55:58 2019 +0100 Refactor button controller to use methods, add some default values, remove unncecessary attributes from component blade. commit a6e3eb8e35cd9726c96d1e04f80ff243786e5eea Author: Alexander Boman Skoug <[email protected]> Date: Wed Dec 11 16:52:54 2019 +0100 Navbar - Refactor - Add cleaner controller - Add minor refactor commit 23ad2645dd95178dc2165198aeff361858499742 Merge: 7997031 bb89dc0 Author: Alexander Boman Skoug <[email protected]> Date: Wed Dec 11 16:03:35 2019 +0100 Merge pull request #51 from helsingborg-stad/feature/navbar-logo-size Navbar - Logo size commit 79970315acb778fd0dd57f07842ecc1e1359006c Merge: 1b6a011 7f6b0b0 Author: Johan Silvergrund <[email protected]> Date: Wed Dec 11 13:11:51 2019 +0100 Merge pull request #55 from helsingborg-stad/feature/button-fix Button fix commit bb89dc017e8cacac472236a3fcb79849a335d785 Merge: a7ce891 1b6a011 Author: Alexander Boman Skoug <[email protected]> Date: Wed Dec 11 11:48:28 2019 +0100 Merge branch 'develop' into feature/navbar-logo-size commit a7ce891b158b94451825eb90d99f175b12dc36b4 Author: Alexander Boman Skoug <[email protected]> Date: Wed Dec 11 11:46:21 2019 +0100 Fixed comments commit 1b6a0112c2d1744e49022139786889f89e454975 Author: Silvergrund <[email protected]> Date: Wed Dec 11 11:25:05 2019 +0100 Squashed commit of the following: commit 7f6b0b0a58f6c16d1ff49668f7170ac76a81ee94 Author: Eric Rosenborg <[email protected]> Date: Wed Dec 11 11:08:11 2019 +0100 Button fix Fix broken toggle buttons, remove unnecessary default attribute, remove unnecessary attributes from button component blade commit 7bb4ef40d2a317bc6ff92ad2cb94f625e882932c Merge: 9d04b60 a52ab57 Author: Johan Silvergrund <[email protected]> Date: Wed Dec 11 11:17:56 2019 +0100 Merge pull request #53 from helsingborg-stad/feature/card-bg-grey Card - Dark background commit 7f6b0b0a58f6c16d1ff49668f7170ac76a81ee94 Author: Eric Rosenborg <[email protected]> Date: Wed Dec 11 11:08:11 2019 +0100 Button fix Fix broken toggle buttons, remove unnecessary default attribute, remove unnecessary attributes from button component blade commit 9d04b604d62131daf9901be03ef925f4363a6dc0 Merge: ea20c5f 2800eb2 Author: Alexander Boman Skoug <[email protected]> Date: Wed Dec 11 11:02:45 2019 +0100 Merge pull request #54 from helsingborg-stad/feature/form Feature/form commit 2800eb29ca8aa12dabc4fb2a542d4aeb8c711470 Author: Silvergrund <[email protected]> Date: Wed Dec 11 10:52:49 2019 +0100 markup commit a52ab5704a3f6b3e89073ef1dd13fa40aa9526a2 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 10 15:28:59 2019 +0100 Card - Dark background - Add default - Add background to controller commit 814d135e7b60dc3e12ba2c51845a09dfea7e697b Author: Silvergrund <[email protected]> Date: Tue Dec 10 15:27:34 2019 +0100 Field validation commit 5f0edc562c50334006623e851bcdcf41eec9bb4b Author: Silvergrund <[email protected]> Date: Tue Dec 10 14:26:38 2019 +0100 field validation commit ea20c5fd595ab75b67f7e19f8de420bc866aef69 Merge: 91af7a4 a532473 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 10 12:23:45 2019 +0100 Merge pull request #52 from helsingborg-stad/feature/icon-button-hover-color Feature/icon button hover color commit a53247378eb662693dc2ae553fa0cabf4d7705ba Merge: b85282f 91af7a4 Author: Eric Rosenborg <[email protected]> Date: Tue Dec 10 12:17:24 2019 +0100 Merge branch 'develop' into feature/icon-button-hover-color commit b85282fbffc66f948b2db68a114dc3eeef86d0e0 Author: Eric Rosenborg <[email protected]> Date: Tue Dec 10 11:35:24 2019 +0100 Add possibility to change background and color on hover. commit bc4511fd5384540fd76e311ef9c09b13a8da30c9 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 10 10:45:51 2019 +0100 Navbar - Logo size - Add new layout commit 91af7a428575f358ec8dff2a317f6ac9912a8762 Merge: 9d4a2f1 825e5e7 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 10 10:41:59 2019 +0100 Merge pull request #50 from helsingborg-stad/feature/navbar-accessability Navbar Accesability commit 9d4a2f193fadcbfc35a233feb4f4f40e74bd3a24 Merge: d3da0e5 120abf1 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 10 10:41:32 2019 +0100 Merge pull request #49 from helsingborg-stad/feature/segment-v1 Segment commit 120abf1eb8fe7f90483f9807fb20f8ee8cea2d0b Author: Alexander Boman Skoug <[email protected]> Date: Mon Dec 9 16:18:53 2019 +0100 Fixed comments commit 825e5e7ddd4922d75a209013043588aa774b1d43 Author: Alexander Boman Skoug <[email protected]> Date: Mon Dec 9 14:48:47 2019 +0100 Navbar Accesability - Add aria label commit 68eee0e4bb5c8bc51fb205f725ff14f1ab207355 Author: Alexander Boman Skoug <[email protected]> Date: Mon Dec 9 13:16:41 2019 +0100 Segment - Add controller - Add layouts - Add json commit 6d50344abb18c7fe1dbaaebacc300b5092864fa6 Author: Silvergrund <[email protected]> Date: Mon Dec 9 12:27:39 2019 +0100 form parameters commit 42929d17bc549fc182fefeae193a760ef233db21 Author: Silvergrund <[email protected]> Date: Thu Dec 5 17:09:21 2019 +0100 Fields commit d3da0e565a852d87f24994dd00215d84cdfa1ca5 Author: Silvergrund <[email protected]> Date: Wed Dec 4 15:51:46 2019 +0100 Added Testimonial commit d957bd6984908672a92d5dddfd85769801bb5272 Author: Silvergrund <[email protected]> Date: Wed Dec 4 15:47:30 2019 +0100 Testimonials controller commit 994a9a5ca0615d5085781ae65bac0d632f5160de Author: Silvergrund <[email protected]> Date: Wed Dec 4 15:47:19 2019 +0100 fix - Testimonials controller commit 9c8ebad246edccdc9ea460d10cb748c66bfc6a7f Merge: b12513a db6350b Author: Johan Silvergrund <[email protected]> Date: Wed Dec 4 11:56:23 2019 +0100 Merge pull request #47 from helsingborg-stad/feature/clean-up-12-03 Clean up commit b12513a7607780dc8e20fc24310b2ef847760285 Merge: 4a322bb 0b0a2cc Author: Johan Silvergrund <[email protected]> Date: Wed Dec 4 11:52:40 2019 +0100 Merge pull request #46 from helsingborg-stad/feature/broken-icons Broken Icons commit 4a322bb6fb6d6b76b5dd4c096810948436ffb4f0 Merge: a1afaf7 0fd0de7 Author: Alexander Boman Skoug <[email protected]> Date: Wed Dec 4 11:23:53 2019 +0100 Merge pull request #48 from helsingborg-stad/feature/code-prism code commit 0fd0de7bb9c112d7ef5dd4875b133c909204f2c9 Author: Silvergrund <[email protected]> Date: Wed Dec 4 10:47:54 2019 +0100 code commit a1afaf757ed3437f1b162d3f7e8cefee0c428804 Author: Silvergrund <[email protected]> Date: Wed Dec 4 01:52:47 2019 +0100 icons testimonials commit 9be1037458beb6b0767c725af4c46bd6b26f14de Merge: 0dc6859 1230d84 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 3 16:43:06 2019 +0100 Merge pull request #45 from helsingborg-stad/feature/Testimonials-layout Feature/testimonials layout commit 0b0a2cca49774845ace3aa384cbb48ce388f49e3 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 3 15:52:51 2019 +0100 Broken Icons - Add correct icons commit db6350b46d18c59ca23a72b863223b9028b08ee4 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 3 14:38:55 2019 +0100 Clean up - Add clean up commit 0dc6859825d668d8d5c4f8b3b11e9b7c0518fe92 Merge: 5f4e52a e861de4 Author: Alexander Boman Skoug <[email protected]> Date: Tue Dec 3 14:25:41 2019 +0100 Merge pull request #44 from helsingborg-stad/feature/icon-generator-fix Feature/icon generator fix commit 1230d84baab0e1bb4e3bb587c96becce6ee7b75f Author: Silvergrund <[email protected]> Date: Tue Dec 3 14:11:34 2019 +0100 Description commit 5d5bb3be5b135ba02feec52d690dbb9e0e091063 Author: Silvergrund <[email protected]> Date: Tue Dec 3 14:08:22 2019 +0100 Description commit d14dde5ee050ec15f0b9033a337539d8b8d2f1b4 Author: Silvergrund <[email protected]> Date: Tue Dec 3 13:44:13 2019 +0100 Testimonials - view structure and parameters commit e861de42764ca61c132db44129fc977c719d1b15 Author: Eric Rosenborg <[email protected]> Date: Tue Dec 3 11:23:28 2019 +0100 Add new method for fetching available icons, fix broken icon in card dropdown commit 109fca38d3ef454c2abd3b70d1e00c7dccb89bbe Author: Silvergrund <[email protected]> Date: Mon Dec 2 16:44:41 2019 +0100 Testimonials refactor commit 5f4e52a64ba2b1bef65d7404236220c52735a6d8 Merge: 7878751 ec14a4b Author: Johan Silvergrund <[email protected]> Date: Mon Dec 2 13:38:01 2019 +0100 Merge pull request #42 from helsingborg-stad/feature/navbar-cleanup Navbar - Clean Uo commit ec14a4b6df58f7058b85dcb454134fae1d082157 Author: Alexander Boman Skoug <[email protected]> Date: Fri Nov 29 17:38:48 2019 +0100 Navbar - Clean Uo - Add default values - Improved php - Add handler for colours commit 05c9dc0698fc8fb018f2943f9173fb91839fd0aa Author: Silvergrund <[email protected]> Date: Fri Nov 29 12:19:20 2019 +0100 Dropdown - format commit 78787517ccfae041d54ba148b1713891e00b0d4e Author: Silvergrund <[email protected]> Date: Thu Nov 28 17:08:34 2019 +0100 fix commit e92e7aeb7f769b1a432e38cfe756ec6146168606 Merge: 623677e 63da68c Author: Johan Silvergrund <[email protected]> Date: Thu Nov 28 16:54:08 2019 +0100 Merge pull request #39 from helsingborg-stad/feature/navbar-design Navbar - Desktop design commit 623677e7afeeeee3ce0923172ef0a8f62ceaa63f Merge: ff71ec2 e1cb41a Author: Alexander Boman Skoug <[email protected]> Date: Thu Nov 28 16:10:56 2019 +0100 Merge pull request #40 from helsingborg-stad/feature/docs Feature/docs commit e1cb41a9df03e31404a77f9bfa504eb1e10dca3c Author: Silvergrund <[email protected]> Date: Thu Nov 28 15:59:41 2019 +0100 Avatar - Fixed icons commit 63da68cd98e6ddfefbb15a8c021942798aa629bd Author: Alexander Boman Skoug <[email protected]> Date: Thu Nov 28 15:35:55 2019 +0100 Navbar - Desktop design - Add altered layout commit f3a9e58f3ee0fd3dc58bd2e391bda3f960522f8c Author: Eric Rosenborg <[email protected]> Date: Thu Nov 28 14:39:18 2019 +0100 Add hoverColor property for iconButtons commit 31c085ada1825dca38933a9ddc60d71e81103d5f Author: Silvergrund <[email protected]> Date: Thu Nov 28 13:31:18 2019 +0100 Refactor Avatar controller commit 01be553bf015672932b728382946bb4cbcb12516 Author: Silvergrund <[email protected]> Date: Thu Nov 28 13:28:33 2019 +0100 Accordion, Avatar commit ff71ec2193f528e4551fbc7f007cbab37c941b26 Author: Silvergrund <[email protected]> Date: Wed Nov 27 15:43:19 2019 +0100 Card - byline fix commit bf7e29acb6a51eb6f5d08fbd71276c12927625ed Merge: f46d141 31bc339 Author: Muckbuck <[email protected]> Date: Wed Nov 27 10:49:45 2019 +0100 Merge pull request #38 from helsingborg-stad/feature/Cards-accordion Card - Accordions commit 31bc33948217fa88c901eae9d020883c61699a33 Author: Muckbuck <[email protected]> Date: Wed Nov 27 10:48:57 2019 +0100 Update card.json commit e0bea4bc116fc72041526bc6b13cca41998a7ffa Author: Silvergrund <[email protected]> Date: Tue Nov 26 16:19:12 2019 +0100 Card - Accordions commit f46d141c6f65a995cd5c50b2b3535a66ea49e01b Author: Sebastian Thulin <[email protected]> Date: Tue Nov 26 14:55:05 2019 +0100 Adds a unique id to markup (#37) commit 4900578752069190a823a0f4b3e7f42af2fb0b18 Author: Silvergrund <[email protected]> Date: Tue Nov 26 14:14:35 2019 +0100 Merge commit 38f03592bfd07af0c6ef280782e76c31162423f3 Merge: 5c0a0c6 6500621 Author: Silvergrund <[email protected]> Date: Tue Nov 26 14:14:20 2019 +0100 Merge branch 'develop' of github.com:helsingborg-stad/blade-component-library into develop # Conflicts: # src/Component/Button/Button.php commit 5c0a0c624a1b385d30c1037abf0925cd859c5934 Author: Silvergrund <[email protected]> Date: Tue Nov 26 14:12:22 2019 +0100 Missing controller var fix commit 6500621423095f79953e698cdb4b1f410fe77f79 Merge: ea9e635 c0bcd23 Author: Johan Silvergrund <[email protected]> Date: Tue Nov 26 10:31:32 2019 +0100 Merge pull request #36 from helsingborg-stad/feature/tabindex Adds tabindex from controller. commit c0bcd2319a79d94f15613af39b020d16a1864069 Author: Sebastian Thulin <[email protected]> Date: Tue Nov 26 10:03:09 2019 +0100 Adds tabindex from controller. commit ea9e6353589a9a5ab2d97f75e7243f7ea020adc0 Author: Sebastian Thulin <[email protected]> Date: Tue Nov 26 09:58:35 2019 +0100 Upeprcase/lowercase fix commit 7ee8dc58a4ee576697670f1f5e97b16e3135bb39 Author: Sebastian Thulin <[email protected]> Date: Tue Nov 26 09:44:50 2019 +0100 Feature/base class generator (#32) * Remove baseclass creation for each component * Fixes generation of baseclass * Remove static reference to base class in btngroup commit 9666b7a7b22d598e5297dfbdd1efd564591f464f Author: Muckbuck <[email protected]> Date: Tue Nov 26 09:43:49 2019 +0100 Add condition to check if its neither outlined nor icon button and if thats the case then just apply text button classes, change background to default to false and color to default to primary to accommodate the new class (#27) commit 4110744c07c0a7d42b5f17c62f5aceaea3a8d01e Author: Muckbuck <[email protected]> Date: Tue Nov 26 09:43:02 2019 +0100 Feature/fw2 78 button group (#21) * Button group A container to group up buttons. - Slot where you add your buttons - borderColor prop - backgroundColor prop - Documentation * Fix format in config commit f90ecc9ffbeb3f66c28a6532d1b096319971073f Author: Muckbuck <[email protected]> Date: Tue Nov 26 09:29:21 2019 +0100 Splitbutton (#25) Simply a collection of components that creates a splitbutton. Namely a buttongroup with a button and a dropdown that are synced so that when you choose an item in the list the buttons text changes to that of the chosen item. commit cc8559a3c66effd0d0bbe7d8b47d741407c6c900 Merge: 76779a5 787e62c Author: Johan Silvergrund <[email protected]> Date: Mon Nov 25 16:34:53 2019 +0100 Merge pull request #35 from helsingborg-stad/feature/id Feature/id commit 787e62c524dbb8f23db034f0ae8d88cb09f14f6a Author: Sebastian Thulin <[email protected]> Date: Mon Nov 25 15:57:32 2019 +0100 Adds the ability to add id’s to all components. If left untouced, an autogenerated hash-based id will be calculated. commit 76779a5a08dd7ec2b7dc8a0cfc5c0751a80292b7 Author: Silvergrund <[email protected]> Date: Mon Nov 25 14:22:54 2019 +0100 button and buttongroup fix commit ab3c4f1476d7ba47e097e1e4be8d738176307321 Author: Silvergrund <[email protected]> Date: Fri Dec 20 11:43:15 2019 +0100 Squashed commit of the following: commit dc491e5e4ff88ae57fc54f015c3466c45513f8f8 Merge: a1063a5 a60673f Author: Alexander Boman Skoug <[email protected]> Date: Thu Dec 19 10:50:33 2019 +0100 Merge pull request #60 from helsingborg-stad/feature/card-button-usage…
1 parent 72e68db commit 9899959

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

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

+20-8
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,29 @@
66
'name' => $icon,
77
'size' => 'lg'
88
],
9-
'image' => $image
9+
'image' => $author_image
1010
])
1111
@endavatar
1212

13-
@typography([
14-
"variant" => "title",
15-
"element" => "h6",
16-
"classList" => [$baseClass.'__author']
17-
])
18-
{{$author}}
19-
@endtypography
13+
@if ($author_url)
14+
@link([
15+
'href' => $author_url,
16+
'classList' => ['c-comment__link']
17+
])
18+
@endif
19+
20+
@typography([
21+
"variant" => "title",
22+
"element" => "h6",
23+
"classList" => [$baseClass.'__author']
24+
])
25+
{{$author}}
26+
@endtypography
27+
28+
@if ($author_url)
29+
@endlink
30+
@endif
31+
2032

2133
@if ($date)
2234
@typography([

‎src/Component/Comment/comment.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@
22
"slug": "comment",
33
"default": {
44
"author": "",
5+
"author_url": "",
6+
"author_image": "",
57
"text": "",
68
"icon": "",
7-
"image": "",
9+
810
"date": "01/02/2019",
911
"componentElement": "div",
1012
"is_reply": false
1113
},
1214
"description": {
1315
"author": "Name of the commenter",
16+
"author_url": "URL to the profile of the author",
17+
"author_image": "A link to an image",
1418
"text": "Content of the comment",
1519
"icon": "Which icon to show",
16-
"image": "A link to an image",
20+
1721
"date": "The date when the comment was posted",
1822
"componentElement": "Element of the component",
1923
"is_reply": "If true the comment will be displayed as a reply"

0 commit comments

Comments
 (0)