From 676aea2a992ff413bf098796a39ba81eb320fb27 Mon Sep 17 00:00:00 2001 From: James Eversole Date: Tue, 27 Feb 2024 12:31:20 -0600 Subject: [PATCH] Layout fixes; move Styles source file into Fragments --- sampu.cabal | 2 +- src/Core/Handlers.hs | 2 +- src/{Core => Fragments}/Styles.hs | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) rename src/{Core => Fragments}/Styles.hs (94%) diff --git a/sampu.cabal b/sampu.cabal index 0170cd6..6d8fa8e 100644 --- a/sampu.cabal +++ b/sampu.cabal @@ -37,7 +37,7 @@ executable sampu Core.Handlers Core.HTTP Core.Rendering - Core.Styles Fragments.Base Fragments.NotFound + Fragments.Styles default-language: GHC2021 diff --git a/src/Core/Handlers.hs b/src/Core/Handlers.hs index de1476d..d4f2dac 100644 --- a/src/Core/Handlers.hs +++ b/src/Core/Handlers.hs @@ -3,9 +3,9 @@ module Core.Handlers where import qualified Core.Configuration as Conf import Core.Feed (Post(..), autoFeed, renderFeed) import Core.Rendering -import Core.Styles as S import Fragments.Base import Fragments.NotFound +import Fragments.Styles as S import qualified Text.Atom.Feed as Atom import Control.Monad.IO.Class (liftIO) diff --git a/src/Core/Styles.hs b/src/Fragments/Styles.hs similarity index 94% rename from src/Core/Styles.hs rename to src/Fragments/Styles.hs index cba6e43..33372bc 100644 --- a/src/Core/Styles.hs +++ b/src/Fragments/Styles.hs @@ -1,4 +1,4 @@ -module Core.Styles where +module Fragments.Styles where import Clay hiding (main_) import qualified Clay.Media as M @@ -85,8 +85,7 @@ main_ :: Css main_ = do ".main" ? do margin (em 0) auto (em 0) auto - maxWidth $ pct 60 - minWidth $ pct 40 + width $ pct 60 notFound_ :: Css notFound_ = do @@ -102,10 +101,11 @@ postList_ :: Css postList_ = do ".postList" ? do margin (em 0) auto (em 0) auto - fontSize (em 1.5) minWidth (pct 60) maxWidth (pct 95) overflow scroll + ul ? do + fontSize (em 1.5) code_ :: Css code_ = do @@ -137,5 +137,6 @@ nav_ = do mobileFriendly_ :: Css mobileFriendly_ = query M.screen [M.maxWidth 768] $ do ".main" ? do - margin (em 1) auto (em 1) auto - maxWidth $ pct 95 + width $ pct 95 + ".postList" ? do + width $ pct 95