From c19abe88a38b7b7abe5f98c3abca83c50fef7c77 Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Thu, 23 Jul 2015 17:18:59 +0100 Subject: [PATCH] Qualify all external imports --- bower.json | 2 +- src/Css/Animation.purs | 4 +++- src/Css/Background.purs | 1 + src/Css/Border.purs | 4 +++- src/Css/Color.purs | 4 +++- src/Css/Display.purs | 1 + src/Css/Elements.purs | 1 + src/Css/Font.purs | 5 ++++- src/Css/FontFace.purs | 6 ++++-- src/Css/Geometry.purs | 4 +++- src/Css/Gradient.purs | 4 +++- src/Css/Media.purs | 4 +++- src/Css/Property.purs | 14 ++++++++------ src/Css/Pseudo.purs | 1 + src/Css/Render.purs | 18 ++++++++++-------- src/Css/Selector.purs | 20 +++++++++++--------- src/Css/Size.purs | 1 + src/Css/Stylesheet.purs | 19 +++++++++++-------- src/Css/Text.purs | 1 + src/Css/Time.purs | 1 + src/Css/Transform.purs | 1 + src/Css/Transition.purs | 1 + 22 files changed, 76 insertions(+), 41 deletions(-) diff --git a/bower.json b/bower.json index 46c0f9d..0ebeaae 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "tests" ], "dependencies": { - "purescript-nonempty": "^0.1.1", + "purescript-nonempty": "^0.1.2", "purescript-profunctor": "^0.3.0", "purescript-strings": "^0.5.2", "purescript-these": "^0.3.0", diff --git a/src/Css/Animation.purs b/src/Css/Animation.purs index 6aa8346..85499e5 100644 --- a/src/Css/Animation.purs +++ b/src/Css/Animation.purs @@ -1,12 +1,14 @@ 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 Data.Tuple.Nested newtype AnimationDirection = AnimationDirection Value diff --git a/src/Css/Background.purs b/src/Css/Background.purs index ab47f0c..d5e59f7 100644 --- a/src/Css/Background.purs +++ b/src/Css/Background.purs @@ -1,6 +1,7 @@ module Css.Background where import Prelude + import Css.Color import Css.Property import Css.String diff --git a/src/Css/Border.purs b/src/Css/Border.purs index b1a1886..a13cc68 100644 --- a/src/Css/Border.purs +++ b/src/Css/Border.purs @@ -1,12 +1,14 @@ 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 Data.Tuple.Nested newtype Stroke = Stroke Value diff --git a/src/Css/Color.purs b/src/Css/Color.purs index 5990a8d..0bcff9c 100644 --- a/src/Css/Color.purs +++ b/src/Css/Color.purs @@ -1,9 +1,11 @@ module Css.Color where import Prelude + +import Data.Foldable (intercalate) + import Css.Property import Css.String -import Data.Foldable data Color = Rgba Int Int Int Int | Hsla Number Number Number Number diff --git a/src/Css/Display.purs b/src/Css/Display.purs index 535ac7b..a85b768 100644 --- a/src/Css/Display.purs +++ b/src/Css/Display.purs @@ -1,6 +1,7 @@ module Css.Display where import Prelude + import Css.Property import Css.String import Css.Stylesheet diff --git a/src/Css/Elements.purs b/src/Css/Elements.purs index c2a42c7..b8d5336 100644 --- a/src/Css/Elements.purs +++ b/src/Css/Elements.purs @@ -1,6 +1,7 @@ module Css.Elements where import Prelude + import Css.Selector import Css.String diff --git a/src/Css/Font.purs b/src/Css/Font.purs index b2b58ba..68d6dab 100644 --- a/src/Css/Font.purs +++ b/src/Css/Font.purs @@ -1,12 +1,15 @@ module Css.Font where import Prelude + +import Data.NonEmpty (NonEmpty(), oneOf) + import Css.Color import Css.Property import Css.Size import Css.String import Css.Stylesheet -import Data.NonEmpty + color :: Color -> Css color = key $ fromString "color" diff --git a/src/Css/FontFace.purs b/src/Css/FontFace.purs index 5d738fc..5c82b1c 100644 --- a/src/Css/FontFace.purs +++ b/src/Css/FontFace.purs @@ -1,11 +1,13 @@ module Css.FontFace where import Prelude + +import Data.Maybe (Maybe(), maybe) +import Data.NonEmpty (NonEmpty()) + import Css.Property import Css.String import Css.Stylesheet -import Data.Maybe -import Data.NonEmpty fontFaceFamily :: String -> Css fontFaceFamily = key (fromString "font-family") <<< Literal diff --git a/src/Css/Geometry.purs b/src/Css/Geometry.purs index c3805a7..8b23d53 100644 --- a/src/Css/Geometry.purs +++ b/src/Css/Geometry.purs @@ -1,10 +1,12 @@ module Css.Geometry where import Prelude hiding (top, bottom) + +import Data.Tuple.Nested (tuple4) + import Css.Size import Css.String import Css.Stylesheet -import Data.Tuple.Nested width :: forall a. Size a -> Css width = key $ fromString "width" diff --git a/src/Css/Gradient.purs b/src/Css/Gradient.purs index c497c1b..651afe2 100644 --- a/src/Css/Gradient.purs +++ b/src/Css/Gradient.purs @@ -1,12 +1,14 @@ module Css.Gradient where import Prelude + +import Data.Foldable (intercalate) + import Css.Background import Css.Color import Css.Property import Css.Size import Css.String -import Data.Foldable data ColorPoint = ColorPoint Color (Size Rel) diff --git a/src/Css/Media.purs b/src/Css/Media.purs index df6f63f..45e81a1 100644 --- a/src/Css/Media.purs +++ b/src/Css/Media.purs @@ -1,11 +1,13 @@ module Css.Media where import Prelude + +import Data.Maybe (Maybe(..)) + import Css.Property import Css.Size import Css.String import Css.Stylesheet -import Data.Maybe screen :: MediaType screen = MediaType $ fromString "screen" diff --git a/src/Css/Property.purs b/src/Css/Property.purs index 08220b2..fb4ae67 100644 --- a/src/Css/Property.purs +++ b/src/Css/Property.purs @@ -1,13 +1,15 @@ module Css.Property where import Prelude + +import Data.Foldable (intercalate) +import Data.Maybe (Maybe(), fromMaybe) +import Data.Monoid (Monoid, mempty) +import Data.NonEmpty (NonEmpty(), oneOf) +import Data.Profunctor.Strong (second) +import Data.Tuple (Tuple(..), lookup) + import Css.String -import Data.Foldable -import Data.Maybe -import Data.Monoid -import Data.Profunctor.Strong -import Data.Tuple -import Data.NonEmpty data Prefixed = Prefixed (Array (Tuple String String)) | Plain String diff --git a/src/Css/Pseudo.purs b/src/Css/Pseudo.purs index 989f8d4..b30c23b 100644 --- a/src/Css/Pseudo.purs +++ b/src/Css/Pseudo.purs @@ -1,6 +1,7 @@ module Css.Pseudo where import Prelude + import Css.Selector import Css.String diff --git a/src/Css/Render.purs b/src/Css/Render.purs index 31145a9..3c716aa 100644 --- a/src/Css/Render.purs +++ b/src/Css/Render.purs @@ -1,18 +1,20 @@ module Css.Render where import Prelude + +import Data.Array ((:), drop, sort, uncons, mapMaybe) +import Data.Either (Either(..), either) +import Data.Foldable (foldMap, intercalate, mconcat) +import Data.Maybe (Maybe(..), fromMaybe, maybe) +import Data.Monoid (Monoid, mempty) +import Data.NonEmpty (NonEmpty(..), (:|), foldl1, oneOf) +import Data.These (These(..), theseLeft, theseRight) +import Data.Tuple (Tuple(..), lookup, uncurry) + import Css.Property import Css.Selector import Css.String import Css.Stylesheet -import Data.Array -import Data.Either -import Data.Foldable -import Data.Maybe -import Data.Monoid -import Data.These -import Data.Tuple -import Data.NonEmpty newtype Inline = Inline String diff --git a/src/Css/Selector.purs b/src/Css/Selector.purs index 5a405b1..bff292c 100644 --- a/src/Css/Selector.purs +++ b/src/Css/Selector.purs @@ -1,8 +1,10 @@ module Css.Selector where import Prelude + +import Data.String (take, drop) + import Css.String -import qualified Data.String as S data Predicate = Id String | Class String @@ -25,11 +27,11 @@ instance ordPredicate :: Ord Predicate where newtype Refinement = Refinement (Array Predicate) instance isStringRefinement :: IsString Refinement where - fromString s = Refinement [ case S.take 1 s of - "#" -> Id $ S.drop 1 s - "." -> Class $ S.drop 1 s - ":" -> Pseudo $ S.drop 1 s - "@" -> Attr $ S.drop 1 s + fromString s = Refinement [ case take 1 s of + "#" -> Id $ drop 1 s + "." -> Class $ drop 1 s + ":" -> Pseudo $ drop 1 s + "@" -> Attr $ drop 1 s _ -> Attr s ] @@ -43,9 +45,9 @@ data Path f = Star data Selector = Selector Refinement (Path Selector) instance isStringSelector :: IsString Selector where - fromString s = case S.take 1 s of - "#" -> Selector (Refinement [Id $ S.drop 1 s]) Star - "." -> Selector (Refinement [Class $ S.drop 1 s]) Star + fromString s = case take 1 s of + "#" -> Selector (Refinement [Id $ drop 1 s]) Star + "." -> Selector (Refinement [Class $ drop 1 s]) Star _ -> Selector (Refinement []) (Elem s) star :: Selector diff --git a/src/Css/Size.purs b/src/Css/Size.purs index 7687b1b..dcc86fb 100644 --- a/src/Css/Size.purs +++ b/src/Css/Size.purs @@ -1,6 +1,7 @@ module Css.Size where import Prelude + import Css.Property import Css.String diff --git a/src/Css/Stylesheet.purs b/src/Css/Stylesheet.purs index 20413e3..5111f4c 100644 --- a/src/Css/Stylesheet.purs +++ b/src/Css/Stylesheet.purs @@ -1,15 +1,18 @@ module Css.Stylesheet where import Prelude -import Control.Monad.Writer -import Control.Monad.Writer.Class -import Css.Property -import Css.Selector + +import Control.Monad.Writer (Writer(), execWriter) +import Control.Monad.Writer.Class (tell) + import Data.Array (singleton) -import Data.Maybe -import Data.Profunctor.Strong -import Data.Tuple -import Data.NonEmpty +import Data.Maybe (Maybe(..)) +import Data.NonEmpty (NonEmpty(), (:|)) +import Data.Profunctor.Strong (second) +import Data.Tuple (Tuple(..)) + +import Css.Property (Val, Key(), Value(), cast, value) +import Css.Selector (Selector(), Refinement()) newtype MediaType = MediaType Value diff --git a/src/Css/Text.purs b/src/Css/Text.purs index 7048759..30df6bf 100644 --- a/src/Css/Text.purs +++ b/src/Css/Text.purs @@ -1,6 +1,7 @@ module Css.Text where import Prelude + import Css.Property import Css.String import Css.Stylesheet diff --git a/src/Css/Time.purs b/src/Css/Time.purs index 6b3ddcc..179991e 100644 --- a/src/Css/Time.purs +++ b/src/Css/Time.purs @@ -1,6 +1,7 @@ module Css.Time where import Prelude + import Css.Property import Css.String diff --git a/src/Css/Transform.purs b/src/Css/Transform.purs index 708d74d..1174454 100644 --- a/src/Css/Transform.purs +++ b/src/Css/Transform.purs @@ -1,6 +1,7 @@ module Css.Transform where import Prelude + import Css.Property import Css.Size import Css.String diff --git a/src/Css/Transition.purs b/src/Css/Transition.purs index 95b83e9..3025a4e 100644 --- a/src/Css/Transition.purs +++ b/src/Css/Transition.purs @@ -1,6 +1,7 @@ module Css.Transition where import Prelude + import Css.String import Css.Property