tweaks

Author: seanhess

embed/reset.css

@@ -75,6 +75,9 @@ module Web.Atomic.CSS
   , BorderStyle (..)
   , rounded
   , opacity
+  , shadow
+  , Shadow
+  , Inner (..)
 
     -- ** Text
   , bold
@@ -91,7 +94,7 @@ module Web.Atomic.CSS
   , transition
   , TransitionProperty (..)
 
-    -- ** Other
+    -- ** Elements
   , list
   , ListType (..)
   , pointer
@@ -112,7 +115,7 @@ module Web.Atomic.CSS
     -- * CSS Reset
   , cssResetEmbed
 
-    -- ** Types
+    -- * Types
   , Property
   , Declaration (..)
   , Style
@@ -127,6 +130,10 @@ module Web.Atomic.CSS
   , Wrap (..)
   , Sides (..)
   , CSS
+
+    -- * Other
+  , declarations
+  , rules
   ) where
 
 import Web.Atomic.CSS.Box hiding (sides, sides')

src/Web/Atomic/CSS.hs

@@ -59,6 +59,7 @@ joinClassSegments sep (ClassName cn1) (ClassName cn2) =
   ClassName $ cn1 <> sep <> cn2
 
 
+-- modifiers to a class are prepended with ":", like hover\:my-class:hover
 addClassState :: (ToClassName a) => a -> ClassName -> ClassName
 addClassState a = joinClassSegments ":" (toClassName a)
 

src/Web/Atomic/Types/ClassName.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE LambdaCase #-}
-
 module Web.Atomic.Types.Rule where
 
 import Data.List qualified as L
@@ -22,7 +20,7 @@ data Rule = Rule
   }
 instance Eq Rule where
   r1 == r2 = ruleSelector r1 == ruleSelector r2
-instance Ord (Rule) where
+instance Ord Rule where
   r1 <= r2 = ruleSelector r1 <= ruleSelector r2
 instance IsString Rule where
   fromString s = fromClass (fromString s)
@@ -41,21 +39,17 @@ instance Monoid RuleSelector where
   mempty = GeneratedRule id id
 
 
--- rule :: ClassName -> [Declaration] -> Rule
--- rule cn ds =
---   (Rule cn (selector cn) mempty ds)
-
 -- | An empty rule that only adds the classname
 fromClass :: ClassName -> Rule
 fromClass cn = Rule cn mempty mempty mempty
 
 
 rule :: ClassName -> [Declaration] -> Rule
-rule cn ds = Rule cn mempty mempty ds
+rule cn = Rule cn mempty mempty
 
 
 ruleMap :: [Rule] -> Map Selector Rule
-ruleMap rs = L.foldl' (\m r -> M.insert (ruleSelector r) r m) M.empty rs
+ruleMap = L.foldl' (\m r -> M.insert (ruleSelector r) r m) M.empty
 
 
 {- | Add a property to a class
@@ -80,7 +74,7 @@ mapClassName f c =
 uniqueRules :: [Rule] -> [Rule]
 uniqueRules [] = []
 uniqueRules (r : rs) =
-  r : (replaceRules r $ uniqueRules rs)
+  r : replaceRules r (uniqueRules rs)
 
 
 replaceRules :: Rule -> [Rule] -> [Rule]

src/Web/Atomic/Types/Rule.hs

@@ -23,11 +23,6 @@ spec = do
       let rs = [fs24, bold, fs12]
       fmap (.className) (uniqueRules rs) `shouldBe` ["fs-24", "bold"]
 
-    -- it "should unset same property using (~)" $ do
-    --   let rs = [] ~ fontSize 12 . bold ~ fontSize 24
-    --   length rs `shouldBe` 3
-    --   fmap (.className) (uniqueRules rs) `shouldBe` ["fs-24", "bold"]
-
     it "should treat hover states as unique" $ do
       let hoverBold = addPseudo "hover" bold
           hoverNormal = addPseudo "hover" normal
@@ -46,17 +41,14 @@ spec = do
       ruleClassName (Rule.fromClass "hello") `shouldBe` "hello"
 
     it "includes pseudo" $ do
-      ruleClassName (addPseudo "active" $ addPseudo "hover" $ "hello") `shouldBe` "active:hover:hello"
+      ruleClassName (addPseudo "active" $ addPseudo "hover" "hello") `shouldBe` "active:hover:hello"
 
     it "includes media" $ do
       ruleClassName (addMedia (MinWidth 100) "hello") `shouldBe` "mmnw100:hello"
 
     it "includes pseudo + media" $ do
       ruleClassName (addMedia (MinWidth 100) $ addPseudo "hover" "hello") `shouldBe` "mmnw100:hover:hello"
 
-  -- it "doesn't change with custom selectors" $ do
-  --   ruleClassName (Rule "hello" (Just ".hello") [Hover] [MinWidth 100] []) `shouldBe` "hello"
-
   describe "selector" $ do
     it "creates selector from class name" $ do
       ruleSelector (Rule.fromClass "p-10") `shouldBe` ".p-10"