Merge pull request #4 from gonimo/master

Fixed naming according to purescript-css

Author: garyb

bower.json

@@ -20,7 +20,7 @@
     "test"
   ],
   "dependencies": {
-    "purescript-css": "^0.4.0",
+    "purescript-css": "^0.5.2",
     "purescript-halogen": "^0.5.3"
   }
 }

package.json

@@ -7,7 +7,7 @@
     "gulp-jscs": "^1.6.0",
     "gulp-jshint": "^1.11.2",
     "gulp-purescript": "^0.7.0",
-    "purescript": "0.7.4",
+    "purescript": "^0.7.6",
     "rimraf": "^2.4.1"
   }
 }

src/Halogen/HTML/CSS.purs

@@ -15,9 +15,9 @@ import Data.String (joinWith)
 import Data.Tuple (Tuple(..))
 import qualified Data.StrMap as SM
 
-import Css.Property (Key(), Value())
-import Css.Render (render, renderedSheet, collect)
-import Css.Stylesheet (Css(), Rule(..), runS)
+import CSS.Property (Key(), Value())
+import CSS.Render (render, renderedSheet, collect)
+import CSS.Stylesheet (CSS(), Rule(..), runS)
 
 import Halogen.HTML.Core (HTML(), Prop(), IsProp, prop, propName, attrName)
 import qualified Halogen.HTML as H
@@ -39,11 +39,11 @@ instance stylesIsProp :: IsProp Styles where
 -- | For example:
 -- |
 -- | ```purescript
--- | H.div [ Css.style do color red
+-- | H.div [ CSS.style do color red
 -- |                      display block ]
 -- |       [ ... ]
 -- | ```
-style :: forall i. Css -> Prop i
+style :: forall i. CSS -> Prop i
 style = prop (propName "style") (Just $ attrName "style") <<< Styles <<< rules <<< runS
   where
   rules :: Array Rule -> SM.StrMap String
@@ -60,7 +60,7 @@ style = prop (propName "style") (Just $ attrName "style") <<< Styles <<< rules <
   rights = mapMaybe (either (const Nothing) Just)
 
 -- | Render a set of rules as a `style` element.
-stylesheet :: forall p i. Css -> HTML p i
+stylesheet :: forall p i. CSS -> HTML p i
 stylesheet css = H.style [ P.type_ "text/css" ] [ H.text content ]
   where
   content = fromMaybe "" $ renderedSheet $ render css

src/Halogen/HTML/CSS/Indexed.purs

@@ -2,14 +2,14 @@ module Halogen.HTML.CSS.Indexed where
 
 import Unsafe.Coerce (unsafeCoerce)
 
-import Css.Stylesheet (Css())
+import CSS.Stylesheet (CSS())
 
 import Halogen.HTML.Elements.Indexed (NoninteractiveNode())
 import Halogen.HTML.Properties.Indexed (IProp(), I())
 import qualified Halogen.HTML.CSS as CSS
 
-style :: forall i r. Css -> IProp (style :: I | r) i
+style :: forall i r. CSS -> IProp (style :: I | r) i
 style = unsafeCoerce CSS.style
 
-stylesheet :: forall p i. Css -> NoninteractiveNode (media :: I, onError :: I, onLoad :: I, scoped :: I, mediaType :: I) p i
+stylesheet :: forall p i. CSS -> NoninteractiveNode (media :: I, onError :: I, onLoad :: I, scoped :: I, mediaType :: I) p i
 stylesheet = unsafeCoerce CSS.stylesheet