From 6aab9b7f8d5fd03e6efb932573a792b7d7c5679b Mon Sep 17 00:00:00 2001 From: Shaun Kerr Date: Thu, 28 Jun 2018 10:08:45 +1200 Subject: [PATCH] Added flexbox. Closes #6 --- Main.hs | 113 +++++++++++++++++++++++++++------------------------------------- 1 file changed, 47 insertions(+), 66 deletions(-) diff --git a/Main.hs b/Main.hs index 5649054..a305564 100644 --- a/Main.hs +++ b/Main.hs @@ -68,7 +68,8 @@ getHomeR = defaultLayout $ do } body { - width: 740px; + min-width: 400px; + max-width: 600px; margin: auto; padding: 20px; text-align: left; @@ -81,7 +82,7 @@ getHomeR = defaultLayout $ do padding: 5px; } - header { + header, footer { margin: 0px; padding: 5px; border-top: 4px solid white; @@ -103,48 +104,24 @@ getHomeR = defaultLayout $ do padding: 5px; } + .flexboxcontainer { + display: flex; + flex-direction: row; + flex-wrap: wrap; + } + ul { text-align: initial; } - .current { - width: 600px; - } - - .currentFormat { - margin: auto; - padding: 1px; - } - - .currentLeft { - width: 300px; - float: left; - } - - .currentRight { - margin-left: 300px; - } - - .upcoming { - width: 600px; - } - - .changes { - margin: auto; - padding: 1px; - } - .upcomingIn { color: #00DD00; background-color: inherit; - width: 300px; - float: left; } .upcomingOut { color: #DD0000; background-color: inherit; - margin-left: 300px; } |] addScriptRemote "https://fonts.googleapis.com/css?family=Inconsolata" @@ -155,40 +132,38 @@ getHomeR = defaultLayout $ do |] toWidgetBody [hamlet|
-
-

Format for #{showMonth month} #{year}: -
-
-

Evergreen: -
    -
  • Revised Core Set x3 -

    Big Boxes: -
      - $forall bb <- bbout -
    • #{bb} -
      -

      Data-packs: -
        - $forall dp <- dpout -
      • #{dp} -
        -

        Upcoming Changes for #{showMonth nextMonth} #{year}: +

        Format for #{showMonth month} #{year}: +
        +
        +

        Evergreen: +
          +
        • Revised Core Set x3 +

          Big Boxes: +
            + $forall bb <- bbout +
          • #{bb} +
            +

            Data-packs: +
              + $forall dp <- dpout +
            • #{dp} +

              Upcoming Changes for #{showMonth nextMonth} #{year}: +
              $maybe (pin, pout, pbin, pbout) <- pr -
              -
              -

              In: -
                - $maybe pbbin <- pbin -
              • + #{show pbbin} - $forall indp <- pin -
              • + #{show indp} -
                -

                Out: -
                  - $maybe pbbout <- pbout -
                • - #{show pbbout} - $forall outdp <- pout -
                • - #{show outdp} +
                  +

                  In: +
                    + $maybe pbbin <- pbin +
                  • + #{show pbbin} + $forall indp <- pin +
                  • + #{show indp} +
                    +

                    Out: +
                      + $maybe pbbout <- pbout +
                    • - #{show pbbout} + $forall outdp <- pout +
                    • - #{show outdp} $nothing

                      Coming soon! |] @@ -224,9 +199,15 @@ getHomeR = defaultLayout $ do
                    • On the 20th of every month, a preview of the next months format will be shown
                    • No matter what the currently legal packs are, Door to Door (Escalation #59) will always be legal |] + toWidgetBody [hamlet| +