diff options
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/Design/Global.hs | 15 | ||||
-rw-r--r-- | src/server/Design/LoggedIn/Home/Pages.hs | 2 | ||||
-rw-r--r-- | src/server/Design/LoggedIn/Income.hs | 5 | ||||
-rw-r--r-- | src/server/Model/Message/Key.hs | 2 | ||||
-rw-r--r-- | src/server/Model/Message/Translations.hs | 14 |
5 files changed, 23 insertions, 15 deletions
diff --git a/src/server/Design/Global.hs b/src/server/Design/Global.hs index 90dd842..e2e98a7 100644 --- a/src/server/Design/Global.hs +++ b/src/server/Design/Global.hs @@ -36,14 +36,19 @@ global = do a ? cursor pointer h1 ? do - fontSize (px 20) + fontSize (px 24) color Color.red - marginBottom (em 1) + "margin-bottom" -: "3vh" ul ? do - marginBottom (em 1) - li ? do - marginBottom (em 0.5) + "margin-bottom" -: "3vh" + "margin-left" -: "1vh" + li <? do + "margin-bottom" -: "2vh" before & do content (stringContent "• ") color Color.red + "margin-right" -: "0.3vw" + ul <? do + "margin-left" -: "3vh" + "margin-top" -: "2vh" diff --git a/src/server/Design/LoggedIn/Home/Pages.hs b/src/server/Design/LoggedIn/Home/Pages.hs index 932865c..0572fbf 100644 --- a/src/server/Design/LoggedIn/Home/Pages.hs +++ b/src/server/Design/LoggedIn/Home/Pages.hs @@ -12,7 +12,7 @@ import Design.Constants design :: Css design = do - padding (px 30) (px 30) (px 30) (px 30) + padding (px 40) (px 30) (px 30) (px 30) textAlign (alignSide (sideCenter)) clearFix diff --git a/src/server/Design/LoggedIn/Income.hs b/src/server/Design/LoggedIn/Income.hs index b7efb9e..99626ba 100644 --- a/src/server/Design/LoggedIn/Income.hs +++ b/src/server/Design/LoggedIn/Income.hs @@ -7,4 +7,7 @@ module Design.LoggedIn.Income import Clay design :: Css -design = h1 ? paddingBottom (px 0) +design = do + h1 ? paddingBottom (px 0) + form ? do + "margin-bottom" -: "3vh" diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index b42cdcd..43b8faa 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -52,7 +52,6 @@ data Key = | CategoryRequired | CostRequired | DateValidationError - | IncomeValidationError -- Payments @@ -73,6 +72,7 @@ data Key = -- Income + | CumulativeIncomesSince | AddIncome | Income | MonthlyNetIncomes diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 1d3fbe6..d4e5454 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -203,11 +203,6 @@ m l DateValidationError = English -> "The date must be day/month/year" French -> "La date doit avoir la forme jour/mois/année" -m l IncomeValidationError = - case l of - English -> "The income must be a positive integer." - French -> "Le revenu doit être un entier positif." - -- Payments m l Add = @@ -269,9 +264,14 @@ m l ByMonths = -- Income +m l CumulativeIncomesSince = + case l of + English -> "Cumulative incomes since {0}" + French -> "Revenus nets cumulés depuis le {0}" + m l AddIncome = case l of - English -> "Add a monthly net income" + English -> "Add a monthly income" French -> "Ajouter un revenu mensuel net" m l Income = @@ -281,7 +281,7 @@ m l Income = m l MonthlyNetIncomes = case l of - English -> "Monthly net incomes" + English -> "Monthly incomes" French -> "Revenus mensuels nets" m l IncomeNotDeleted = |