Skip to content

Fix many warnings, update to latest generics, update docs, etc #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
language: node_js
sudo: false
node_js:
- 0.10
env:
- PATH=$HOME/bin:$PATH
- 4
install:
- mkdir $HOME/bin
- npm install bower gulp -g
- npm install && bower install
script:
- gulp
after_success:
- >-
test $TRAVIS_TAG &&
node_modules/.bin/psc-publish > .pursuit.json &&
curl -X POST http://pursuit.purescript.org/packages \
-d @.pursuit.json \
-H 'Accept: application/json' \
-H "Authorization: token ${GITHUB_TOKEN}"
17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
# purescript-css
A clean, type-safe library for describing, manipulating and rendering CSS

[![Latest release](http://img.shields.io/bower/v/purescript-css.svg)](https://github.com/slamdata/purescript-css/releases)
[![Build Status](https://travis-ci.org/slamdata/purescript-css.svg?branch=master)](https://travis-ci.org/slamdata/purescript-css)
[![Dependency Status](https://www.versioneye.com/user/projects/564f5f32ff016c002c00052d/badge.svg?style=flat)](https://www.versioneye.com/user/projects/564f5f32ff016c002c00052d)

A type-safe library for describing, manipulating, and rendering CSS.

## Installation

```
bower install purescript-css
```

## Documentation

Module documentation is published on Pursuit: [http://pursuit.purescript.org/packages/purescript-css](http://pursuit.purescript.org/packages/purescript-css)
7 changes: 6 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
"purescript",
"css"
],
"license": "MIT",
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "git://github.com/slamdata/purescript-css.git"
},
"ignore": [
"**/.*",
"node_modules",
Expand All @@ -17,6 +21,7 @@
"tests"
],
"dependencies": {
"purescript-generics": "^0.7.0",
"purescript-nonempty": "^0.1.2",
"purescript-profunctor": "^0.3.1",
"purescript-strings": "^0.7.0",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"private": true,
"devDependencies": {
"purescript": "^0.7.4",
"gulp": "^3.8.11",
"gulp-jscs": "^1.6.0",
"gulp-jshint": "^1.11.2",
"gulp-purescript": "^0.7.0",
"gulp-run": "^1.6.8"
"gulp-run": "^1.6.8",
"purescript": "^0.7.6-rc.1"
}
}
50 changes: 25 additions & 25 deletions site/Main.purs
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
module Site where

import Control.Monad.Eff
import Css.Animation
import Css.Background
import Css.Border
import Css.Color
import Css.Display
import Css.Elements
import Css.Font
import Css.FontFace
import Css.Geometry
import Css.Gradient
import qualified Css.Media as M
import Css.Pseudo
import Css.Render
import Css.Selector
import Css.Size
import Css.String
import Css.Stylesheet
import Css.Text
import Css.Time
import Css.Transform
import Css.Transition
import CSS.Animation
import CSS.Background
import CSS.Border
import CSS.Color
import CSS.Display
import CSS.Elements
import CSS.Font
import CSS.FontFace
import CSS.Geometry
import CSS.Gradient
import qualified CSS.Media as M
import CSS.Pseudo
import CSS.Render
import CSS.Selector
import CSS.Size
import CSS.String
import CSS.Stylesheet
import CSS.Text
import CSS.Time
import CSS.Transform
import CSS.Transition
import Data.Maybe
import Data.Tuple.Nested
import DOM
Expand Down Expand Up @@ -63,13 +63,13 @@ blue1 = rgb 51 136 204
blue2 :: Color
blue2 = rgb 238 238 255

backgroundGradient :: forall a. Angle a -> Css
backgroundGradient :: forall a. Angle a -> CSS
backgroundGradient a = backgroundImage $ linearGradient a (ColorPoint white (pct 0)) [] (ColorPoint blue2 (pct 100))

shake :: (Number -> Number) -> Css
shake :: (Number -> Number) -> CSS
shake f = transforms [translate (px (f 3)) nil, rotate (deg (f 2))]

style :: Css
style :: CSS
style = do
fontFace $ do
fontFaceFamily $ fromString "Lato"
Expand Down Expand Up @@ -108,7 +108,7 @@ style = do
(h1 ## hover) ?
animation (fromString "buzz-button") (sec 0.15) linear (sec 0) infinite normalAnimationDirection forwards

center :: Number -> Number -> Css
center :: Number -> Number -> CSS
center width height = do
marginLeft (px $ -width / 2)
marginTop (px $ -height / 2)
Expand Down
14 changes: 7 additions & 7 deletions src/Css/Animation.purs → src/CSS/Animation.purs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module Css.Animation where
module CSS.Animation where

import Prelude

import Data.Tuple.Nested (tuple7)

import Css.Property
import Css.String
import Css.Stylesheet
import Css.Time
import Css.Transition
import CSS.Property
import CSS.String
import CSS.Stylesheet
import CSS.Time
import CSS.Transition

newtype AnimationDirection = AnimationDirection Value

Expand Down Expand Up @@ -49,7 +49,7 @@ forwards = FillMode $ fromString "forwards"
backwards :: FillMode
backwards = FillMode $ fromString "backwards"

animation :: AnimationName -> Time -> TimingFunction -> Time -> IterationCount -> AnimationDirection -> FillMode -> Css
animation :: AnimationName -> Time -> TimingFunction -> Time -> IterationCount -> AnimationDirection -> FillMode -> CSS
animation p de f du i di fm = key (fromString "-webkit-animation") (tuple7 p de f du i di fm)

newtype AnimationName = AnimationName Value
Expand Down
14 changes: 7 additions & 7 deletions src/Css/Background.purs → src/CSS/Background.purs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
module Css.Background where
module CSS.Background where

import Prelude

import Css.Color
import Css.Property
import Css.String
import Css.Stylesheet
import CSS.Color
import CSS.Property
import CSS.String
import CSS.Stylesheet

backgroundColor :: Color -> Css
backgroundColor :: Color -> CSS
backgroundColor = key $ fromString "background-color"

newtype BackgroundImage = BackgroundImage Value

instance valBackroundImage :: Val BackgroundImage where
value (BackgroundImage v) = v

backgroundImage :: BackgroundImage -> Css
backgroundImage :: BackgroundImage -> CSS
backgroundImage = key $ fromString "background-image"
18 changes: 9 additions & 9 deletions src/Css/Border.purs → src/CSS/Border.purs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module Css.Border where
module CSS.Border where

import Prelude

import Data.Tuple.Nested (tuple3, tuple4)

import Css.Color
import Css.Property
import Css.Size
import Css.String
import Css.Stylesheet
import CSS.Color
import CSS.Property
import CSS.Size
import CSS.String
import CSS.Stylesheet

newtype Stroke = Stroke Value

Expand Down Expand Up @@ -42,11 +42,11 @@ inset = Stroke $ fromString "inset"
outset :: Stroke
outset = Stroke $ fromString "outset"

border :: Stroke -> Size Abs -> Color -> Css
border :: Stroke -> Size Abs -> Color -> CSS
border a b c = key (fromString "border") $ tuple3 a b c

borderColor :: Color -> Css
borderColor :: Color -> CSS
borderColor = key $ fromString "border-color"

borderRadius :: forall a. Size a -> Size a -> Size a -> Size a -> Css
borderRadius :: forall a. Size a -> Size a -> Size a -> Size a -> CSS
borderRadius a b c d = key (fromString "border-radius") (tuple4 a b c d)
Loading