diff options
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/Design/Global.hs | 2 | ||||
-rw-r--r-- | src/server/Design/Header.hs | 6 | ||||
-rw-r--r-- | src/server/Design/LoggedIn/Home.hs | 2 | ||||
-rw-r--r-- | src/server/Design/LoggedIn/Home/Search.hs | 16 | ||||
-rw-r--r-- | src/server/Model/Message/Key.hs | 1 | ||||
-rw-r--r-- | src/server/Model/Message/Translations.hs | 5 | ||||
-rw-r--r-- | src/server/View/Page.hs | 1 |
7 files changed, 28 insertions, 5 deletions
diff --git a/src/server/Design/Global.hs b/src/server/Design/Global.hs index 12e20b9..900994a 100644 --- a/src/server/Design/Global.hs +++ b/src/server/Design/Global.hs @@ -51,3 +51,5 @@ global = do ul <? do "margin-left" -: "3vh" "margin-top" -: "2vh" + + svg ? height (pct 100) diff --git a/src/server/Design/Header.hs b/src/server/Design/Header.hs index 6f0f48e..4e31891 100644 --- a/src/server/Design/Header.hs +++ b/src/server/Design/Header.hs @@ -57,10 +57,8 @@ design = do ".signOut" ? do heightMedia - color Color.white - - Media.mobile $ fontSize (px 20) - Media.tabletDesktop $ fontSize iconFontSize + svg ? do + Media.mobile $ width (px 20) lineHeightMedia :: Css lineHeightMedia = do diff --git a/src/server/Design/LoggedIn/Home.hs b/src/server/Design/LoggedIn/Home.hs index be99a2c..c0a8566 100644 --- a/src/server/Design/LoggedIn/Home.hs +++ b/src/server/Design/LoggedIn/Home.hs @@ -8,6 +8,7 @@ import Clay import qualified Design.LoggedIn.Home.Add as AddDesign import qualified Design.LoggedIn.Home.Expandables as ExpandablesDesign +import qualified Design.LoggedIn.Home.Search as SearchDesign import qualified Design.LoggedIn.Home.Table as TableDesign import qualified Design.LoggedIn.Home.Pages as PagesDesign @@ -15,5 +16,6 @@ design :: Css design = do form # ".addPayment" ? AddDesign.design ".expandables" ? ExpandablesDesign.design + ".search" ? SearchDesign.design ".table" ? TableDesign.design ".pages" ? PagesDesign.design diff --git a/src/server/Design/LoggedIn/Home/Search.hs b/src/server/Design/LoggedIn/Home/Search.hs new file mode 100644 index 0000000..0292eaa --- /dev/null +++ b/src/server/Design/LoggedIn/Home/Search.hs @@ -0,0 +1,16 @@ +{-# LANGUAGE OverloadedStrings #-} + +module Design.LoggedIn.Home.Search + ( design + ) where + +import Clay + +import Design.Color as Color +import Design.Constants +import Design.Helper + +design :: Css +design = do + expandBlock Color.gothic Color.white (px inputHeight) + ".label" ? marginRight (px 10) diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index dea1a03..7c48e71 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -64,6 +64,7 @@ data Key = | PaymentsTitle | Payment | Payments + | Search -- Statistics diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 7bde74f..f593c49 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -245,6 +245,11 @@ m l Payment = English -> "payment" French -> "paiement" +m l Search = + case l of + English -> "Search" + French -> "Recherche" + m l Payments = case l of English -> "payments" diff --git a/src/server/View/Page.hs b/src/server/View/Page.hs index 17c59c0..5a2e4f8 100644 --- a/src/server/View/Page.hs +++ b/src/server/View/Page.hs @@ -35,7 +35,6 @@ page conf initResult = jsonScript "conf" conf jsonScript "result" initResult link ! rel "stylesheet" ! type_ "text/css" ! href "css/reset.css" - link ! rel "stylesheet" ! href "css/font-awesome-4.5.0/css/font-awesome.min.css" link ! rel "icon" ! type_ "image/png" ! href "images/icon.png" H.style $ toHtml globalDesign body $ do |