Skip to content

Commit

Permalink
Merge pull request #5 from slamdata/qualify-imports
Browse files Browse the repository at this point in the history
Qualify all external imports
  • Loading branch information
jdegoes committed Jul 23, 2015
2 parents 7c8b067 + c19abe8 commit 150ae11
Show file tree
Hide file tree
Showing 22 changed files with 76 additions and 41 deletions.
2 changes: 1 addition & 1 deletion bower.json
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion 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

Expand Down
1 change: 1 addition & 0 deletions src/Css/Background.purs
@@ -1,6 +1,7 @@
module Css.Background where

import Prelude

import Css.Color
import Css.Property
import Css.String
Expand Down
4 changes: 3 additions & 1 deletion 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

Expand Down
4 changes: 3 additions & 1 deletion 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
Expand Down
1 change: 1 addition & 0 deletions src/Css/Display.purs
@@ -1,6 +1,7 @@
module Css.Display where

import Prelude

import Css.Property
import Css.String
import Css.Stylesheet
Expand Down
1 change: 1 addition & 0 deletions src/Css/Elements.purs
@@ -1,6 +1,7 @@
module Css.Elements where

import Prelude

import Css.Selector
import Css.String

Expand Down
5 changes: 4 additions & 1 deletion 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"
Expand Down
6 changes: 4 additions & 2 deletions 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
Expand Down
4 changes: 3 additions & 1 deletion 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"
Expand Down
4 changes: 3 additions & 1 deletion 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)

Expand Down
4 changes: 3 additions & 1 deletion 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"
Expand Down
14 changes: 8 additions & 6 deletions 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
Expand Down
1 change: 1 addition & 0 deletions src/Css/Pseudo.purs
@@ -1,6 +1,7 @@
module Css.Pseudo where

import Prelude

import Css.Selector
import Css.String

Expand Down
18 changes: 10 additions & 8 deletions 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

Expand Down
20 changes: 11 additions & 9 deletions 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
Expand All @@ -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
]

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/Css/Size.purs
@@ -1,6 +1,7 @@
module Css.Size where

import Prelude

import Css.Property
import Css.String

Expand Down
19 changes: 11 additions & 8 deletions 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

Expand Down
1 change: 1 addition & 0 deletions src/Css/Text.purs
@@ -1,6 +1,7 @@
module Css.Text where

import Prelude

import Css.Property
import Css.String
import Css.Stylesheet
Expand Down
1 change: 1 addition & 0 deletions src/Css/Time.purs
@@ -1,6 +1,7 @@
module Css.Time where

import Prelude

import Css.Property
import Css.String

Expand Down
1 change: 1 addition & 0 deletions src/Css/Transform.purs
@@ -1,6 +1,7 @@
module Css.Transform where

import Prelude

import Css.Property
import Css.Size
import Css.String
Expand Down
1 change: 1 addition & 0 deletions src/Css/Transition.purs
@@ -1,6 +1,7 @@
module Css.Transition where

import Prelude

import Css.String
import Css.Property

Expand Down

0 comments on commit 150ae11

Please sign in to comment.