Skip to content

Commit c5ca4cc

Browse files
garybgaryb
committed
Fix many warnings, update to latest generics, update docs, etc
1 parent a264ff2 commit c5ca4cc

29 files changed

+677
-353
lines changed

‎.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- 0.10
5-
env:
6-
- PATH=$HOME/bin:$PATH
4+
- 4
75
install:
8-
- mkdir $HOME/bin
96
- npm install bower gulp -g
107
- npm install && bower install
118
script:
129
- gulp
10+
after_success:
11+
- >-
12+
test $TRAVIS_TAG &&
13+
node_modules/.bin/psc-publish > .pursuit.json &&
14+
curl -X POST http://pursuit.purescript.org/packages \
15+
-d @.pursuit.json \
16+
-H 'Accept: application/json' \
17+
-H "Authorization: token ${GITHUB_TOKEN}"

‎README.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
11
# purescript-css
2-
A clean, type-safe library for describing, manipulating and rendering CSS
2+
3+
[![Latest release](http://img.shields.io/bower/v/purescript-css.svg)](https://github.com/slamdata/purescript-css/releases)
4+
[![Build Status](https://travis-ci.org/slamdata/purescript-css.svg?branch=master)](https://travis-ci.org/slamdata/purescript-css)
5+
[![Dependency Status](https://www.versioneye.com/user/projects/564f5f32ff016c002c00052d/badge.svg?style=flat)](https://www.versioneye.com/user/projects/564f5f32ff016c002c00052d)
6+
7+
A type-safe library for describing, manipulating, and rendering CSS.
8+
9+
## Installation
10+
11+
```
12+
bower install purescript-css
13+
```
14+
15+
## Documentation
16+
17+
Module documentation is published on Pursuit: [http://pursuit.purescript.org/packages/purescript-css](http://pursuit.purescript.org/packages/purescript-css)

‎bower.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
"purescript",
99
"css"
1010
],
11-
"license": "MIT",
11+
"license": "Apache-2.0",
12+
"repository": {
13+
"type": "git",
14+
"url": "git://github.com/slamdata/purescript-css.git"
15+
},
1216
"ignore": [
1317
"**/.*",
1418
"node_modules",
@@ -17,6 +21,7 @@
1721
"tests"
1822
],
1923
"dependencies": {
24+
"purescript-generics": "^0.7.0",
2025
"purescript-nonempty": "^0.1.2",
2126
"purescript-profunctor": "^0.3.1",
2227
"purescript-strings": "^0.7.0",

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"purescript": "^0.7.4",
54
"gulp": "^3.8.11",
65
"gulp-jscs": "^1.6.0",
76
"gulp-jshint": "^1.11.2",
87
"gulp-purescript": "^0.7.0",
9-
"gulp-run": "^1.6.8"
8+
"gulp-run": "^1.6.8",
9+
"purescript": "^0.7.6-rc.1"
1010
}
1111
}

‎site/Main.purs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
module Site where
22

33
import Control.Monad.Eff
4-
import Css.Animation
5-
import Css.Background
6-
import Css.Border
7-
import Css.Color
8-
import Css.Display
9-
import Css.Elements
10-
import Css.Font
11-
import Css.FontFace
12-
import Css.Geometry
13-
import Css.Gradient
14-
import qualified Css.Media as M
15-
import Css.Pseudo
16-
import Css.Render
17-
import Css.Selector
18-
import Css.Size
19-
import Css.String
20-
import Css.Stylesheet
21-
import Css.Text
22-
import Css.Time
23-
import Css.Transform
24-
import Css.Transition
4+
import CSS.Animation
5+
import CSS.Background
6+
import CSS.Border
7+
import CSS.Color
8+
import CSS.Display
9+
import CSS.Elements
10+
import CSS.Font
11+
import CSS.FontFace
12+
import CSS.Geometry
13+
import CSS.Gradient
14+
import qualified CSS.Media as M
15+
import CSS.Pseudo
16+
import CSS.Render
17+
import CSS.Selector
18+
import CSS.Size
19+
import CSS.String
20+
import CSS.Stylesheet
21+
import CSS.Text
22+
import CSS.Time
23+
import CSS.Transform
24+
import CSS.Transition
2525
import Data.Maybe
2626
import Data.Tuple.Nested
2727
import DOM
@@ -63,13 +63,13 @@ blue1 = rgb 51 136 204
6363
blue2 :: Color
6464
blue2 = rgb 238 238 255
6565

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

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

72-
style :: Css
72+
style :: CSS
7373
style = do
7474
fontFace $ do
7575
fontFaceFamily $ fromString "Lato"
@@ -108,7 +108,7 @@ style = do
108108
(h1 ## hover) ?
109109
animation (fromString "buzz-button") (sec 0.15) linear (sec 0) infinite normalAnimationDirection forwards
110110

111-
center :: Number -> Number -> Css
111+
center :: Number -> Number -> CSS
112112
center width height = do
113113
marginLeft (px $ -width / 2)
114114
marginTop (px $ -height / 2)

‎src/Css/Animation.purs renamed to ‎src/CSS/Animation.purs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
module Css.Animation where
1+
module CSS.Animation where
22

33
import Prelude
44

55
import Data.Tuple.Nested (tuple7)
66

7-
import Css.Property
8-
import Css.String
9-
import Css.Stylesheet
10-
import Css.Time
11-
import Css.Transition
7+
import CSS.Property
8+
import CSS.String
9+
import CSS.Stylesheet
10+
import CSS.Time
11+
import CSS.Transition
1212

1313
newtype AnimationDirection = AnimationDirection Value
1414

@@ -49,7 +49,7 @@ forwards = FillMode $ fromString "forwards"
4949
backwards :: FillMode
5050
backwards = FillMode $ fromString "backwards"
5151

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

5555
newtype AnimationName = AnimationName Value

‎src/Css/Background.purs renamed to ‎src/CSS/Background.purs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
module Css.Background where
1+
module CSS.Background where
22

33
import Prelude
44

5-
import Css.Color
6-
import Css.Property
7-
import Css.String
8-
import Css.Stylesheet
5+
import CSS.Color
6+
import CSS.Property
7+
import CSS.String
8+
import CSS.Stylesheet
99

10-
backgroundColor :: Color -> Css
10+
backgroundColor :: Color -> CSS
1111
backgroundColor = key $ fromString "background-color"
1212

1313
newtype BackgroundImage = BackgroundImage Value
1414

1515
instance valBackroundImage :: Val BackgroundImage where
1616
value (BackgroundImage v) = v
1717

18-
backgroundImage :: BackgroundImage -> Css
18+
backgroundImage :: BackgroundImage -> CSS
1919
backgroundImage = key $ fromString "background-image"

‎src/Css/Border.purs renamed to ‎src/CSS/Border.purs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
module Css.Border where
1+
module CSS.Border where
22

33
import Prelude
44

55
import Data.Tuple.Nested (tuple3, tuple4)
66

7-
import Css.Color
8-
import Css.Property
9-
import Css.Size
10-
import Css.String
11-
import Css.Stylesheet
7+
import CSS.Color
8+
import CSS.Property
9+
import CSS.Size
10+
import CSS.String
11+
import CSS.Stylesheet
1212

1313
newtype Stroke = Stroke Value
1414

@@ -42,11 +42,11 @@ inset = Stroke $ fromString "inset"
4242
outset :: Stroke
4343
outset = Stroke $ fromString "outset"
4444

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

48-
borderColor :: Color -> Css
48+
borderColor :: Color -> CSS
4949
borderColor = key $ fromString "border-color"
5050

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

0 commit comments

Comments
 (0)