Skip to content

Commit 7a39810

Browse files
authored
Merge pull request #37 from garyb/updates
Updates
2 parents 3fe427e + 995a553 commit 7a39810

36 files changed

+501
-419
lines changed

.travis.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js:
5-
- 4
4+
node_js: 6
65
install:
7-
- npm install bower gulp -g
8-
- npm install && bower install
6+
- npm install -g bower
7+
- npm install
98
script:
10-
- gulp
9+
- bower install --production
10+
- npm run -s build
11+
- bower install
12+
- npm -s test
1113
after_success:
1214
- >-
1315
test $TRAVIS_TAG &&
14-
node_modules/.bin/psc-publish > .pursuit.json &&
15-
curl -X POST http://pursuit.purescript.org/packages \
16-
-d @.pursuit.json \
17-
-H 'Accept: application/json' \
18-
-H "Authorization: token ${GITHUB_TOKEN}"
16+
echo $GITHUB_TOKEN | pulp login &&
17+
echo y | pulp publish --no-push

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"dependencies": {
2424
"purescript-generics": "^1.0.0",
25-
"purescript-nonempty": "^1.0.0",
25+
"purescript-nonempty": "^1.1.0",
2626
"purescript-profunctor": "^1.0.0",
2727
"purescript-strings": "^1.0.0",
2828
"purescript-these": "^1.0.0",

gulpfile.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{
22
"private": true,
3+
"scripts": {
4+
"clean": "rimraf output && rimraf .pulp-cache",
5+
"build": "pulp build --censor-lib --strict",
6+
"test": "pulp test"
7+
},
38
"devDependencies": {
4-
"gulp": "^3.8.11",
5-
"gulp-jscs": "^1.6.0",
6-
"gulp-jshint": "^1.11.2",
7-
"gulp-purescript": "^1.0.0",
8-
"gulp-run": "^1.6.8",
9-
"purescript": "^0.9.1"
9+
"pulp": "^9.0.0",
10+
"purescript-psa": "^0.3.9",
11+
"purescript": "^0.9.1",
12+
"rimraf": "^2.5.0"
1013
}
1114
}

site/Main.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

site/Main.purs

Lines changed: 0 additions & 100 deletions
This file was deleted.

site/index.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/CSS.purs

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
module CSS (module X) where
22

3-
import CSS.Animation as X
4-
import CSS.Background as X
5-
import CSS.Border as X
6-
import CSS.Box as X
7-
import CSS.Color as X
8-
import CSS.Display as X
9-
import CSS.Elements as X
10-
import CSS.Flexbox hiding (flex) as X
11-
import CSS.FontFace as X
12-
import CSS.Font as X
13-
import CSS.Geometry as X
14-
import CSS.Gradient as X
15-
import CSS.Property as X
16-
import CSS.Pseudo as X
17-
import CSS.Selector as X
18-
import CSS.Size as X
19-
import CSS.String as X
20-
import CSS.Stylesheet as X
21-
import CSS.Text as X
22-
import CSS.Text.Whitespace as X
23-
import CSS.Time as X
24-
import CSS.Transform as X
25-
import CSS.Transition as X
3+
import CSS.Animation (AnimationDirection(..), AnimationName(..), FillMode(..), IterationCount(..), alternate, alternateReverse, animation, backwards, forwards, infinite, iterationCount, normalAnimationDirection, reverse) as X
4+
import CSS.Background (class Background, class Loc, BackgroundAttachment, BackgroundClip, BackgroundImage, BackgroundOrigin, BackgroundPosition, BackgroundRepeat, BackgroundSize, Direction, Location, Side, angular, attachFixed, attachScroll, background, backgroundAttachment, backgroundAttachments, backgroundClip, backgroundClips, backgroundColor, backgroundImage, backgroundImages, backgroundOrigin, backgroundOrigins, backgroundPosition, backgroundPositions, backgroundRepeat, backgroundRepeats, backgroundSize, backgroundSizes, boxClip, by, contain, cover, location, noRepeat, origin, placed, positioned, repeat, repeatX, repeatY, round, sideBottom, sideCenter, sideLeft, sideMiddle, sideRight, sideTop, space, straight, url, xyRepeat) as X
5+
import CSS.Border (Stroke(..), border, borderColor, borderRadius, dashed, dotted, double, groove, inset, outset, ridge, solid, wavy) as X
6+
import CSS.Box (BoxType, borderBox, boxShadow, boxSizing, contentBox, insetBoxShadow, paddingBox) as X
7+
import CSS.Color (Color, ColorSpace(..), aliceblue, antiquewhite, aqua, aquamarine, azure, beige, bisque, black, blanchedalmond, blue, blueviolet, brightness, brown, burlywood, cadetblue, chartreuse, chocolate, complementary, contrast, coral, cornflowerblue, cornsilk, crimson, cssStringHSLA, cssStringRGBA, cyan, darkblue, darkcyan, darken, darkgoldenrod, darkgray, darkgreen, darkgrey, darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred, darksalmon, darkseagreen, darkslateblue, darkslategray, darkslategrey, darkturquoise, darkviolet, deeppink, deepskyblue, desaturate, dimgray, dimgrey, distance, dodgerblue, firebrick, floralwhite, forestgreen, fromHexString, fromInt, fuchsia, gainsboro, ghostwhite, gold, goldenrod, gray, graytone, green, greenyellow, grey, honeydew, hotpink, hsl, hsla, indianred, indigo, isLight, isReadable, ivory, khaki, lab, lavender, lavenderblush, lawngreen, lch, lemonchiffon, lightblue, lightcoral, lightcyan, lighten, lightgoldenrodyellow, lightgray, lightgreen, lightgrey, lightpink, lightsalmon, lightseagreen, lightskyblue, lightslategray, lightslategrey, lightsteelblue, lightyellow, lime, limegreen, linen, luminance, magenta, maroon, mediumaquamarine, mediumblue, mediumorchid, mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen, mediumturquoise, mediumvioletred, midnightblue, mintcream, mistyrose, mix, moccasin, navajowhite, navy, oldlace, olive, olivedrab, orange, orangered, orchid, palegoldenrod, palegreen, paleturquoise, palevioletred, papayawhip, peachpuff, peru, pink, plum, powderblue, purple, red, rgb, rgb', rgba, rgba', rosybrown, rotateHue, royalblue, saddlebrown, salmon, sandybrown, saturate, seagreen, seashell, sienna, silver, skyblue, slateblue, slategray, slategrey, snow, springgreen, steelblue, tan, teal, textColor, thistle, toGray, toHSLA, toHexString, toLCh, toLab, toRGBA, toRGBA', toXYZ, tomato, turquoise, violet, wheat, white, whitesmoke, xyz, yellow, yellowgreen) as X
8+
import CSS.Display (Display(..), Position(..), absolute, block, display, displayInherit, displayNone, fixed, flex, grid, inline, inlineBlock, inlineFlex, inlineGrid, inlineTable, listItem, position, relative, runIn, static, table, tableCaption, tableCell, tableColumn, tableColumnGroup, tableFooterGroup, tableHeaderGroup, tableRow, tableRowGroup) as X
9+
import CSS.Elements (a, abbr, address, area, article, aside, audio, b, bdi, bdo, blockquote, body, br, button, canvas, caption, cite, code, col, colgroup, datalist, dd, del, details, dfn, div, dl, dt, embed, fieldset, figcaption, figure, footer, form, h1, h2, h3, h4, h5, h6, header, hr, html, i, iframe, img, input, ins, kbd, label, legend, li, main, map, mark, meter, nav, object, ol, optgroup, output, p, pre, progress, q, s, samp, section, small, span, strong, sub, summary, sup, tbody, td, textarea, tfoot, th, thead, tr, u, ul, var) as X
10+
import CSS.Flexbox (class FlexEnd, class FlexStart, class SpaceAround, class SpaceBetween, class Stretch, AlignContentValue(..), AlignItemsValue(..), AlignSelfValue(..), FlexDirection(..), FlexWrap(..), JustifyContentValue(..), alignContent, alignItems, alignSelf, column, columnReverse, flexBasis, flexDirection, flexEnd, flexFlow, flexGrow, flexShrink, flexStart, flexWrap, justifyContent, nowrap, order, row, rowReverse, spaceAround, spaceBetween, stretch, wrap, wrapReverse) as X
11+
import CSS.FontFace (FontFaceFormat(..), FontFaceSrc(..), fontFaceFamily, fontFaceSrc, formatName) as X
12+
import CSS.Font (FontWeight(..), GenericFontFamily(..), bold, bolder, color, fontFamily, fontSize, fontWeight, lighter, sansSerif, weight) as X
13+
import CSS.Geometry (bottom, height, left, margin, marginBottom, marginLeft, marginRight, marginTop, maxHeight, maxWidth, minHeight, minWidth, padding, paddingBottom, paddingLeft, paddingRight, paddingTop, right, top, width) as X
14+
import CSS.Gradient (Extend, Radial, Ramp, circle, circular, closestCorner, closestSide, ellipse, elliptical, farthestCorner, farthestSide, hGradient, hRepeatingGradient, linearGradient, radialGradient, repeatingLinearGradient, repeatingRadialGradient, vGradient, vRepeatingGradient) as X
15+
import CSS.Property (class Val, Key(..), Literal(..), Prefixed(..), Value(..), cast, noCommas, plain, quote, value, (!)) as X
16+
import CSS.Render (Rendered, Inline(..), Sheet(..), collect, collect', face, feature, frame, getInline, getSheet, imp, kframe, mediaQuery, mediaType, merger, nel, predicate, properties, putInline, putStyleSheet, query', render, renderedInline, renderedSheet, rule', rules, selector, selector', selector'', sepWith) as X
17+
import CSS.Pseudo (hover) as X
18+
import CSS.Selector (Path(..), Predicate(..), Refinement(..), Selector(..), child, deep, element, star, with, (##), (**), (|>)) as X
19+
import CSS.Size (Abs, Deg, Rad, Rel, Angle(..), Size(..), deg, em, ex, nil, pct, pt, px, rad, rem, sym, vh, vmax, vmin, vw) as X
20+
import CSS.String (class IsString, fromString) as X
21+
import CSS.Stylesheet (CSS, App(..), Feature(..), Keyframes(..), MediaQuery(..), MediaType(..), NotOrOnly(..), Rule(..), StyleM(..), fontFace, importUrl, key, keyframes, keyframesFromTo, prefixed, query, rule, runS, select, (?)) as X
22+
import CSS.Text (TextDecoration(..), blink, lineThrough, noneTextDecoration, overline, textDecoration, underline) as X
23+
import CSS.Text.Whitespace (TextWhitespace, textWhitespace, whitespaceNoWrap, whitespaceNormal, whitespacePre, whitespacePreLine, whitespacePreWrap) as X
24+
import CSS.Time (Time(..), ms, sec) as X
25+
import CSS.Transform (Transformation(..), rotate, transform, transforms, translate) as X
26+
import CSS.Transition (TimingFunction(..), easeOut, linear) as X

src/CSS/Animation.purs

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@ module CSS.Animation where
22

33
import Prelude
44

5-
import Data.Tuple.Nested (tuple7)
65
import Data.Foldable (for_)
6+
import Data.Generic (class Generic)
7+
import Data.Tuple.Nested (tuple7)
78

8-
import CSS.Property
9-
import CSS.String
10-
import CSS.Stylesheet
11-
import CSS.Time
12-
import CSS.Transition
9+
import CSS.Property (class Val, Value, value)
10+
import CSS.String (class IsString, fromString)
11+
import CSS.Stylesheet (CSS, key)
12+
import CSS.Time (Time)
13+
import CSS.Transition (TimingFunction)
1314

1415
newtype AnimationDirection = AnimationDirection Value
1516

17+
derive instance eqAnimationDirection :: Eq AnimationDirection
18+
derive instance ordAnimationDirection :: Ord AnimationDirection
19+
derive instance genericAnimationDirection :: Generic AnimationDirection
20+
1621
instance valAnimationDirection :: Val AnimationDirection where
1722
value (AnimationDirection v) = v
1823

@@ -30,6 +35,10 @@ alternateReverse = AnimationDirection $ fromString "alternate-reverse"
3035

3136
newtype IterationCount = IterationCount Value
3237

38+
derive instance eqIterationCount :: Eq IterationCount
39+
derive instance ordIterationCount :: Ord IterationCount
40+
derive instance genericIterationCount :: Generic IterationCount
41+
3342
instance valIterationCount :: Val IterationCount where
3443
value (IterationCount v) = v
3544

@@ -41,6 +50,10 @@ iterationCount = IterationCount <<< value
4150

4251
newtype FillMode = FillMode Value
4352

53+
derive instance eqFillMode :: Eq FillMode
54+
derive instance ordFillMode :: Ord FillMode
55+
derive instance genericFillMode :: Generic FillMode
56+
4457
instance valFillMode :: Val FillMode where
4558
value (FillMode v) = v
4659

@@ -62,10 +75,12 @@ animation p de f du i di fm = do
6275
, "-o-animation"
6376
]
6477

65-
66-
6778
newtype AnimationName = AnimationName Value
6879

80+
derive instance eqAnimationName :: Eq AnimationName
81+
derive instance ordAnimationName :: Ord AnimationName
82+
derive instance genericAnimationName :: Generic AnimationName
83+
6984
instance valAnimationName :: Val AnimationName where
7085
value (AnimationName v) = v
7186

0 commit comments

Comments
 (0)