git.iko.soy/denis
on master help sign in
Merge pull request #126 from ilyakooo0/develop
4eabab0iko
denis/src/Server/Auth/HTML.hs+6−3
compare with master
unifiedsplit
@@ -35,9 +35,12 @@ genActivationPage verb ua = genPage $ do
35
35
36
36
37genPage :: Markup -> Markup
37genPage :: Markup -> Markup
38+genPage pageContent = html $ do
39+ H.head $ do
40+ meta ! name "viewport" ! content "width=device-width, initial-scale=1"
38−genPage pageContent = html $ body ! A.style "font-family: sans-serif; background-color: #eee" $ do
41+ body ! A.style "font-family: sans-serif; background-color: #eee" $ do
39− H.div ! A.style "text-align: center; margin-top: 20vh; margin-left: 10%; margin-right: 10%" $ do
42+ H.div ! A.style "text-align: center; margin-top: 20vh; margin-left: 10%; margin-right: 10%" $ do
40− H.div ! A.style "font-size: 40px; font-weight: bold;" $ pageContent
43+ H.div ! A.style "font-size: 40px; font-weight: bold;" $ pageContent
41
44
42errorPage :: Markup
45errorPage :: Markup
43errorPage = genPage $ "Sorry, something went wrong."
46errorPage = genPage $ "Sorry, something went wrong."
denis/src/Server/Auth/Mail.hs+2
@@ -48,6 +48,8 @@ sendMailWithConfig (MailConfig host port user pass) =
48
48
49genMail :: String -> TokenVerificationCode -> UserId -> String -> String -> TL.Text -> Part
49genMail :: String -> TokenVerificationCode -> UserId -> String -> String -> TL.Text -> Part
50genMail rootUrl userCode uId activation deactivation ua = htmlPart . renderHtml $ html $ body ! A.style "font-family: sans-serif;" $ do
50genMail rootUrl userCode uId activation deactivation ua = htmlPart . renderHtml $ html $ body ! A.style "font-family: sans-serif;" $ do
51+ H.div ! A.style "display: none; max-height: 0px; overflow: hidden;" $ toHtml ua <> ": " <> toHtml [a', b', c', d', e', f']
52+ H.div ! A.style "display: none; max-height: 0px; overflow: hidden;" $ "            "
51 H.div ! A.style "text-align: center; margin-top: 55px;" $ do
53 H.div ! A.style "text-align: center; margin-top: 55px;" $ do
52 H.a ! href (stringValue $ rootUrl <> "/authentication/activateUser?id=" <> show uId <> "&data=" <> activation) ! A.style "font-size: 34px; font-weight: bold; display: inline-block; padding: 7px 13px 7px 13px; margin-bottom: 89px; text-decoration: underline; font-family: sans-serif; color: #555;" $ "Log in"
54 H.a ! href (stringValue $ rootUrl <> "/authentication/activateUser?id=" <> show uId <> "&data=" <> activation) ! A.style "font-size: 34px; font-weight: bold; display: inline-block; padding: 7px 13px 7px 13px; margin-bottom: 89px; text-decoration: underline; font-family: sans-serif; color: #555;" $ "Log in"
53 br
55 br