Commit 561ff7ca authored by Alexandre Delanoë's avatar Alexandre Delanoë

[HOME/Design]

parent a0c03fc1
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
border:3px solid white; border:3px solid white;
} }
#funnyimg {
border:2px solid black;
}
#page-wrapper { #page-wrapper {
margin-top : 96px; margin-top : 96px;
} }
......
...@@ -206,11 +206,14 @@ optps cv val = option [ selected (cv == val), value $ show val ] [text $ show va ...@@ -206,11 +206,14 @@ optps cv val = option [ selected (cv == val), value $ show val ] [text $ show va
textDescription :: Int -> PageSizes -> Int -> ReactElement textDescription :: Int -> PageSizes -> Int -> ReactElement
textDescription currPage pageSize totalRecords textDescription currPage pageSize totalRecords
= text $ "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords = div [className "row"]
[ div [className "col-md-12"]
[ text $ "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords ]
]
where where
start = (currPage - 1) * pageSizes2Int pageSize + 1 start = (currPage - 1) * pageSizes2Int pageSize + 1
end' = currPage * pageSizes2Int pageSize end' = currPage * pageSizes2Int pageSize
end = if end' > totalRecords then totalRecords else end' end = if end' > totalRecords then totalRecords else end'
pagination :: _ -> Int -> Int -> ReactElement pagination :: _ -> Int -> Int -> ReactElement
......
...@@ -83,7 +83,7 @@ layoutLanding' hd = simpleSpec performAction render ...@@ -83,7 +83,7 @@ layoutLanding' hd = simpleSpec performAction render
render :: Render State props Action render :: Render State props Action
render dispatch _ state _ = render dispatch _ state _ =
[ div [ className "container1" ] [ jumboTitle hd false ] [ div [ className "container1" ] [ jumboTitle hd false ]
, div [ className "container1" ] [ imageEnter hd (onClick \_ -> dispatch $ Enter)] , div [ className "container1" ] [] -- put research here
, div [ className "container1" ] [ blocksRandomText' hd ] , div [ className "container1" ] [ blocksRandomText' hd ]
] ]
------------------------------------------------------------------------ ------------------------------------------------------------------------
...@@ -122,21 +122,22 @@ docButton (Button b) = a [ className "btn btn-outline-primary btn-sm spacing-cla ...@@ -122,21 +122,22 @@ docButton (Button b) = a [ className "btn btn-outline-primary btn-sm spacing-cla
jumboTitle :: LandingData -> Boolean -> ReactElement jumboTitle :: LandingData -> Boolean -> ReactElement
jumboTitle (LandingData hd) b = div jumbo jumboTitle (LandingData hd) b = div jumbo
[ div [className "row" ] [ div [className "row" ]
[ div [className "col-md-4 content"] [ div [ className "col-md-8 content"]
[ h1 [] [ text hd.name] [ p [ className "left" ]
, p [] [ text hd.signature ]
]
, div [className "col-md-4 content"] []
, div [ className "col-md-4 content"]
[ p [ className "right" ]
[ div [_id "logo-designed" ] [ div [_id "logo-designed" ]
[ img [ src "images/logo.png" [ img [ src "images/logo.png"
, title hd.logoTitle , title hd.logoTitle
] ] []
[] ]
]
]
, div [ className "col-md-4 content"]
[ img [ src "images/Gargantextuel.jpg"
, _id "funnyimg"
, title hd.imageTitle
]
[]
] ]
]
]
] ]
] ]
where where
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment