Skip to content

Commit 197ab7a

Browse files
committed
css wip
1 parent 3d64c0f commit 197ab7a

File tree

3 files changed

+30
-20
lines changed

3 files changed

+30
-20
lines changed

ghcjs/delivery-calculator/src/App/Widgets/Main.hs

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ mainWidget st =
2222
]
2323
$ [ header_ mempty $ Menu.menu st
2424
]
25-
<> [ main_ [class_ "main-widget-middle"] $ screenWidget st
25+
<> [ main_
26+
[class_ "main-widget-middle"]
27+
$ screenWidget st
2628
]
27-
<> [ footer_ mempty tosWidget
29+
<> [ footer_
30+
[style_ [("text-align", "center")]]
31+
[tosWidget]
2832
]
2933
<> ( if st ^. #modelLoading
3034
then
@@ -210,19 +214,21 @@ foldFieldPair :: Rational -> FieldPair DynamicField f -> Rational
210214
foldFieldPair acc =
211215
foldField acc . fieldPairValue
212216

213-
tosWidget :: [View Action]
217+
tosWidget :: View Action
214218
tosWidget =
215-
[ Miso.text "\169 2024 ",
216-
BrowserLink.browserLink
217-
BrowserLink.Args
218-
{ BrowserLink.argsLink = functoraLink,
219-
BrowserLink.argsLabel = "Functora",
220-
BrowserLink.argsAction = PushUpdate . Instant
221-
},
222-
Miso.text ". All rights reserved. ",
223-
Miso.text "By continuing to use this software, you agree to the ",
224-
a_ [href_ "license.html"] [Miso.text "Terms of Service"],
225-
Miso.text " and ",
226-
a_ [href_ "privacy.html"] [Miso.text "Privacy Policy"],
227-
Miso.text $ ". Version " <> vsn <> "."
228-
]
219+
small_
220+
mempty
221+
[ Miso.text "\169 2024 ",
222+
BrowserLink.browserLink
223+
BrowserLink.Args
224+
{ BrowserLink.argsLink = functoraLink,
225+
BrowserLink.argsLabel = "Functora",
226+
BrowserLink.argsAction = PushUpdate . Instant
227+
},
228+
Miso.text ". All rights reserved. ",
229+
Miso.text "By continuing to use this software, you agree to the ",
230+
a_ [href_ "license.html"] [Miso.text "Terms of Service"],
231+
Miso.text " and ",
232+
a_ [href_ "privacy.html"] [Miso.text "Privacy Policy"],
233+
Miso.text $ ". Version " <> vsn <> "."
234+
]

ghcjs/delivery-calculator/src/App/Widgets/Menu.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ import qualified Text.URI as URI
2222
menu :: Model -> [View Action]
2323
menu st =
2424
[ menu_
25-
[ class_ "no-print"
25+
[ class_ "no-print",
26+
style_
27+
[ ("flex-direction", "row"),
28+
("flex-wrap", "wrap")
29+
]
2630
]
2731
[ li_ [onClick opened] [text "menu"],
2832
li_

ghcjs/delivery-calculator/static/app.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ footer {
1515
.main-widget {
1616
margin: 0;
1717
padding: 0;
18-
width: 100vw;
18+
width: 100%;
1919
min-height: 100vh;
20-
overflow-x: hidden;
2120
display: flex;
2221
flex-direction: column;
2322
justify-content: space-between;
23+
/* overflow-x: hidden; */
2424
}
2525

2626
.main-widget-middle {

0 commit comments

Comments
 (0)