Skip to content

Update to v0.14.0-rc3 #125

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 5 commits into from
Dec 12, 2020
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:

- name: Set up a PureScript toolchain
uses: purescript-contrib/setup-purescript@main
with:
purescript: "0.14.0-rc3"

- name: Cache PureScript dependencies
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"purescript-nonempty": "master",
"purescript-profunctor": "master",
"purescript-strings": "master",
"purescript-these": "master",
"purescript-these": "main",
"purescript-transformers": "master",
"purescript-colors": "master",
"purescript-console": "master"
Expand Down
2 changes: 1 addition & 1 deletion packages.dhall
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201007/packages.dhall sha256:35633f6f591b94d216392c9e0500207bb1fec42dd355f4fecdfd186956567b6b
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.14/src/packages.dhall

in upstream
1 change: 1 addition & 0 deletions src/CSS/Property.purs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ plain (Plain p) = p
quote :: String -> String
quote s = "\"" <> s <> "\""

newtype Key :: Type -> Type
newtype Key a = Key Prefixed

derive instance eqKey :: (Eq a) => Eq (Key a)
Expand Down
3 changes: 2 additions & 1 deletion src/CSS/Render.purs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import Data.Array (null, (:), drop, sort, uncons, mapMaybe)
import Data.Either (Either(..), either)
import Data.Foldable (fold, foldMap, intercalate)
import Data.Maybe (Maybe(..), fromMaybe, maybe)
import Data.NonEmpty (NonEmpty(..), (:|), foldl1, oneOf)
import Data.NonEmpty (NonEmpty(..), (:|), oneOf)
import Data.Semigroup.Foldable (foldl1)
import Data.These (These(..), theseLeft, theseRight)
import Data.Tuple (Tuple(..), lookup, uncurry)
import Effect (Effect)
Expand Down
2 changes: 2 additions & 0 deletions src/CSS/Size.purs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import CSS.Common (class Auto)
import CSS.Property (class Val, Value, value)
import CSS.String (class IsString, fromString)

newtype Size :: Type -> Type
newtype Size a = Size Value

derive instance eqSize :: Eq a => Eq (Size a)
Expand Down Expand Up @@ -77,6 +78,7 @@ sym f a = f a a a a
data Deg
data Rad

newtype Angle :: Type -> Type
newtype Angle a = Angle Value

derive instance eqAngle :: Eq a => Eq (Angle a)
Expand Down
1 change: 1 addition & 0 deletions src/CSS/Text/Shadow.purs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import CSS.String (fromString)
import CSS.Stylesheet (CSS, key)
import Data.Tuple.Nested (tuple4)

data TextShadow :: Type -> Type
data TextShadow a
= TextShadow (Size a) (Size a) (Size a) (Color)
| None
Expand Down
2 changes: 2 additions & 0 deletions src/CSS/Transform.purs
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,14 @@ matrix3d w0 x0 y0 z0
, w3, x3, y3, z3
] <> fromString ")"

data TransformOrigin :: Type -> Type
data TransformOrigin a
= TransformOrigin (TransformOriginOffset a) (TransformOriginOffset a) (Size a)
| Initial
| Inherit
| Unset

data TransformOriginOffset :: Type -> Type
data TransformOriginOffset a
= OffsetLength (Size a)
| OffsetTop
Expand Down