byteverse/colonnade
1
1
Fork 0
mirror of https://github.com/byteverse/colonnade.git synced 2024-08-16 02:00:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from olynch/master

Browse Source 
Added semigroup instance for ghc8 compatibility
This commit is contained in:
Andrew Martin 2018-05-29 18:03:33 -04:00 committed by GitHub
commit 372cd4b843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blaze-colonnade/blaze-colonnade.cabal
View File

@ -1,5 +1,5 @@
name: blaze-colonnade
version: 1.2.0
version: 1.2.1
synopsis: Helper functions for using blaze-html with colonnade
description: Blaze HTML and colonnade
homepage: https://github.com/andrewthad/colonnade#readme

8
blaze-colonnade/src/Text/Blaze/Colonnade.hs
View File

@ -53,7 +53,8 @@ import Text.Blaze.Html (Html, toHtml)
import Colonnade (Colonnade,Headed,Headless,Fascia,Cornice)
import Data.Text (Text)
import Control.Monad
import Data.Monoid
import Data.Semigroup
import Data.Monoid hiding ((<>))
import Data.Foldable
import Data.String (IsString(..))
import Data.Maybe (listToMaybe)
@ -266,9 +267,12 @@ data Cell = Cell
instance IsString Cell where
fromString = stringCell
instance Semigroup Cell where
(Cell a1 c1) <> (Cell a2 c2) = Cell (a1 <> a2) (c1 <> c2)
instance Monoid Cell where
mempty = Cell mempty mempty
mappend (Cell a1 c1) (Cell a2 c2) = Cell (mappend a1 a2) (mappend c1 c2)
mappend = (<>)
-- | Create a 'Cell' from a 'Widget'
htmlCell :: Html -> Cell