Merge remote-tracking branch 'slamdata/master' into topic/list-style-rule

Author: alexmingoia

src/CSS/Border.purs

@@ -50,6 +50,18 @@ outset = Stroke $ fromString "outset"
 border :: Stroke -> Size Abs -> Color -> CSS
 border a b c = key (fromString "border") $ tuple3 a b c
 
+borderTop :: Stroke -> Size Abs -> Color -> CSS
+borderTop a b c = key (fromString "border-top") $ tuple3 a b c
+
+borderBottom :: Stroke -> Size Abs -> Color -> CSS
+borderBottom a b c = key (fromString "border-bottom") $ tuple3 a b c
+
+borderLeft :: Stroke -> Size Abs -> Color -> CSS
+borderLeft a b c = key (fromString "border-left") $ tuple3 a b c
+
+borderRight :: Stroke -> Size Abs -> Color -> CSS
+borderRight a b c = key (fromString "border-right") $ tuple3 a b c
+
 borderColor :: Color -> CSS
 borderColor = key $ fromString "border-color"
 

src/CSS/Common.purs

@@ -27,7 +27,9 @@ class Visible  a where visible  :: a
 class Hidden   a where hidden   :: a
 class Initial  a where initial  :: a
 class Unset    a where unset    :: a
-
+class Top      a where top      :: a
+class Middle   a where middle   :: a
+class Bottom   a where bottom   :: a
 class URL      a where url      :: String -> a
 
 -- | The other type class is used to escape from the type safety introduced by
@@ -48,7 +50,9 @@ instance hiddenValue   :: Hidden   Value where hidden   = fromString "hidden"
 instance otherValue    :: Other    Value where other    = id
 instance initialValue  :: Initial  Value where initial  = fromString "initial"
 instance unsetValue    :: Unset    Value where unset    = fromString "unset"
-
+instance topValue      :: Top      Value where top      = fromString "top"
+instance middleValue   :: Middle   Value where middle   = fromString "middle"
+instance bottomValue   :: Bottom   Value where bottom   = fromString "bottom"
 instance urlValue :: URL Value where url s = fromString ("url(\"" <> s <> "\")")
 
 -------------------------------------------------------------------------------

src/CSS/Geometry.purs

@@ -66,3 +66,6 @@ marginLeft = key $ fromString "margin-left"
 
 marginRight :: forall a. Size a -> CSS
 marginRight = key $ fromString "margin-right"
+
+lineHeight :: forall a. Size a -> CSS
+lineHeight = key $ fromString "line-height"

src/CSS/Text.purs

@@ -1,12 +1,14 @@
 module CSS.Text where
 
 import Prelude
-
-import Data.Generic (class Generic)
-
 import CSS.Property (class Val, Value)
+import CSS.Size (Size)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Generic (class Generic)
+
+letterSpacing :: forall a. Size a -> CSS
+letterSpacing = key $ fromString "letter-spacing"
 
 newtype TextDecoration = TextDecoration Value
 

src/CSS/Text/Shadow.purs

@@ -0,0 +1,33 @@
+module CSS.Text.Shadow where
+
+import CSS.Color (Color)
+import CSS.Common (class Inherit, class Initial, class None)
+import CSS.Property (class Val, value)
+import CSS.Size (Size)
+import CSS.String (fromString)
+import CSS.Stylesheet (CSS, key)
+import Data.Tuple.Nested (tuple4)
+
+data TextShadow a
+  = TextShadow (Size a) (Size a) (Size a) (Color)
+  | None
+  | Initial
+  | Inherit
+
+instance valTextShadow :: Val (TextShadow a) where
+  value (TextShadow h v b c) = value (tuple4 h v b c)
+  value (None) = fromString "none"
+  value (Initial) = fromString "initial"
+  value (Inherit) = fromString "inherit"
+
+instance noneTextShadow :: None (TextShadow a) where
+  none = None
+
+instance initialTextShadow :: Initial (TextShadow a) where
+  initial = Initial
+
+instance inheritTextShadow :: Inherit (TextShadow a) where
+  inherit = Inherit
+
+textShadow :: forall a. Size a -> Size a -> Size a -> Color -> CSS
+textShadow h v b c = key (fromString "text-shadow") (TextShadow h v b c)

src/CSS/Transform.purs

@@ -1,13 +1,13 @@
 module CSS.Transform where
 
 import Prelude
-
-import Data.Generic (class Generic)
-
-import CSS.Property (class Val, Value, value, noCommas)
+import CSS.Common (class Inherit, class Initial, class Unset)
+import CSS.Property (class Val, Value, noCommas, value)
 import CSS.Size (Angle, Abs, Size)
 import CSS.String (fromString)
 import CSS.Stylesheet (CSS, key)
+import Data.Generic (class Generic)
+import Data.Tuple.Nested (tuple3)
 
 newtype Transformation = Transformation Value
 
@@ -29,3 +29,61 @@ translate x y = Transformation $ fromString "translate(" <> value [x, y] <> from
 
 rotate :: forall a. Angle a -> Transformation
 rotate a = Transformation $ fromString "rotate(" <> value a <> fromString ")"
+
+data TransformOrigin a
+  = TransformOrigin (TransformOriginOffset a) (TransformOriginOffset a) (Size a)
+  | Initial
+  | Inherit
+  | Unset
+
+data TransformOriginOffset a
+  = OffsetLength (Size a)
+  | OffsetTop
+  | OffsetBottom
+  | OffsetLeft
+  | OffsetRight
+  | OffsetCenter
+
+instance valTransformOriginOffset :: Val (TransformOriginOffset a) where
+  value (OffsetLength s) = value s
+  value (OffsetTop) = fromString "top"
+  value (OffsetBottom) = fromString "bottom"
+  value (OffsetLeft) = fromString "left"
+  value (OffsetRight) = fromString "right"
+  value (OffsetCenter) = fromString "center"
+
+instance valTransformOrigin :: Val (TransformOrigin a) where
+  value (TransformOrigin x y z) = value (tuple3 x y z)
+  value (Initial) = fromString "initial"
+  value (Inherit) = fromString "inherit"
+  value (Unset) = fromString "unset"
+
+instance initialTransformOrigin :: Initial (TransformOrigin a) where
+  initial = Initial
+
+instance inheritTransformOrigin :: Inherit (TransformOrigin a) where
+  inherit = Inherit
+
+instance unsetTransformOrigin :: Unset (TransformOrigin a) where
+  unset = Unset
+
+offset :: forall a. Size a -> TransformOriginOffset a
+offset = OffsetLength
+
+offsetTop :: forall a. TransformOriginOffset a
+offsetTop = OffsetTop
+
+offsetBottom :: forall a. TransformOriginOffset a
+offsetBottom = OffsetBottom
+
+offsetLeft :: forall a. TransformOriginOffset a
+offsetLeft = OffsetLeft
+
+offsetRight :: forall a. TransformOriginOffset a
+offsetRight = OffsetRight
+
+offsetCenter :: forall a. TransformOriginOffset a
+offsetCenter = OffsetCenter
+
+transformOrigin :: forall a. TransformOriginOffset a -> TransformOriginOffset a -> Size a -> CSS
+transformOrigin x y z = key (fromString "transform-origin") (TransformOrigin x y z)

src/CSS/VerticalAlign.purs

@@ -0,0 +1,69 @@
+module CSS.VerticalAlign where
+
+import CSS.Common (class Baseline, class Inherit, class Initial, class Unset, class Top, class Middle, class Bottom)
+import CSS.Property (class Val)
+import CSS.String (fromString)
+import CSS.Stylesheet (CSS, key)
+import Data.Function (($))
+
+data VerticalAlign
+  = Baseline
+  | Sub
+  | Super
+  | TextTop
+  | TextBottom
+  | Middle
+  | Top
+  | Bottom
+  | Inherit
+  | Initial
+  | Unset
+
+instance valVerticalAlign :: Val (VerticalAlign) where
+  value (Baseline) = fromString "baseline"
+  value (Sub) = fromString "sub"
+  value (Super) = fromString "super"
+  value (TextTop) = fromString "text-top"
+  value (TextBottom) = fromString "text-bottom"
+  value (Middle) = fromString "middle"
+  value (Top) = fromString "top"
+  value (Bottom) = fromString "bottom"
+  value (Inherit) = fromString "inherit"
+  value (Initial) = fromString "initial"
+  value (Unset) = fromString "unset"
+
+instance inheritVerticalAlign :: Inherit (VerticalAlign) where
+  inherit = Inherit
+
+instance initialVerticalAlign :: Initial (VerticalAlign) where
+  initial = Initial
+
+instance unsetVerticalAlign :: Unset (VerticalAlign) where
+  unset = Unset
+
+instance baselineVerticalAlign :: Baseline (VerticalAlign) where
+  baseline = Baseline
+
+instance middleVerticalAlign :: Middle (VerticalAlign) where
+  middle = Middle
+
+instance topVerticalAlign :: Top (VerticalAlign) where
+  top = Top
+
+instance bottomVerticalAlign :: Bottom (VerticalAlign) where
+  bottom = Bottom
+
+sub :: VerticalAlign
+sub = Sub
+
+super :: VerticalAlign
+super = Super
+
+textTop :: VerticalAlign
+textTop = TextTop
+
+textBottom :: VerticalAlign
+textBottom = TextBottom
+
+verticalAlign :: VerticalAlign -> CSS
+verticalAlign = key $ fromString "vertical-align"