From 898e7ed11ab0958fcdaf65b99b33f7b04787630a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Sep 2017 22:14:48 +0200
Subject: Bootstrap with GHCJS and reflex:

- setup login and logout,
- first draft of payment view.
---
 src/server/Design/Global.hs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/server/Design/Global.hs')

diff --git a/src/server/Design/Global.hs b/src/server/Design/Global.hs
index e742978..47ea4a9 100644
--- a/src/server/Design/Global.hs
+++ b/src/server/Design/Global.hs
@@ -8,9 +8,7 @@ import Clay
 
 import Data.Text.Lazy (Text)
 
-import qualified Design.Header as Header
-import qualified Design.SignIn as SignIn
-import qualified Design.LoggedIn as LoggedIn
+import qualified Design.Views as Views
 import qualified Design.Form as Form
 import qualified Design.Errors as Errors
 import qualified Design.Dialog as Dialog
@@ -26,13 +24,10 @@ globalDesign = renderWith compact [] global
 
 global :: Css
 global = do
-
-  header ? Header.design
-  ".signIn" ? SignIn.design
-  ".loggedIn" ? LoggedIn.design
   ".errors" ? Errors.design
   ".dialog" ? Dialog.design
   ".tooltip" ? Tooltip.design
+  Views.design
   Form.design
 
   body ? do
@@ -49,6 +44,8 @@ global = do
 
   a ? cursor pointer
 
+  input ? fontSize inherit
+
   h1 ? do
     color Color.chestnutRose
     marginBottom (em 1)
-- 
cgit v1.2.3


From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 src/server/Design/Global.hs | 75 ---------------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 src/server/Design/Global.hs

(limited to 'src/server/Design/Global.hs')

diff --git a/src/server/Design/Global.hs b/src/server/Design/Global.hs
deleted file mode 100644
index 47ea4a9..0000000
--- a/src/server/Design/Global.hs
+++ /dev/null
@@ -1,75 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module Design.Global
-  ( globalDesign
-  ) where
-
-import Clay
-
-import Data.Text.Lazy (Text)
-
-import qualified Design.Views as Views
-import qualified Design.Form as Form
-import qualified Design.Errors as Errors
-import qualified Design.Dialog as Dialog
-import qualified Design.Tooltip as Tooltip
-
-import qualified Design.Color as Color
-import qualified Design.Helper as Helper
-import qualified Design.Constants as Constants
-import qualified Design.Media as Media
-
-globalDesign :: Text
-globalDesign = renderWith compact [] global
-
-global :: Css
-global = do
-  ".errors" ? Errors.design
-  ".dialog" ? Dialog.design
-  ".tooltip" ? Tooltip.design
-  Views.design
-  Form.design
-
-  body ? do
-    minWidth (px 320)
-    fontFamily ["Cantarell"] [sansSerif]
-    Media.tablet $ do
-      fontSize (px 15)
-      button ? fontSize (px 15)
-      input ? fontSize (px 15)
-    Media.mobile $ do
-      fontSize (px 14)
-      button ? fontSize (px 14)
-      input ? fontSize (px 14)
-
-  a ? cursor pointer
-
-  input ? fontSize inherit
-
-  h1 ? do
-    color Color.chestnutRose
-    marginBottom (em 1)
-    lineHeight (em 1.2)
-
-    Media.desktop $ fontSize (px 24)
-    Media.tablet $ fontSize (px 22)
-    Media.mobile $ fontSize (px 20)
-
-  ul ? do
-    "margin-bottom" -: "3vh"
-    "margin-left" -: "1vh"
-    li <? do
-      "margin-bottom" -: "2vh"
-      before & do
-        content (stringContent "• ")
-        color Color.chestnutRose
-        "margin-right" -: "0.3vw"
-      ul <? do
-        "margin-left" -: "3vh"
-        "margin-top" -: "2vh"
-
-  ".dialog" ? ".content" ? button ? do
-    ".confirm" & Helper.button Color.chestnutRose Color.white (px Constants.inputHeight) Constants.focusLighten
-    ".undo" & Helper.button Color.silver Color.white (px Constants.inputHeight) Constants.focusLighten
-
-  svg ? height (pct 100)
-- 
cgit v1.2.3