diff --git a/.gitignore b/.gitignore index 6e45465..c1b4e89 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,9 @@ static/app.css static/articles static/paragraph_quotes +# @todo: Fix the creation of duplicates +static/styleGuideImages/imageStyles + Application/Migration # JWT diff --git a/Web/Element/PageTitle.hs b/Web/Element/PageTitle.hs new file mode 100644 index 0000000..5ab60e5 --- /dev/null +++ b/Web/Element/PageTitle.hs @@ -0,0 +1,16 @@ +module Web.Element.PageTitle where + +import Web.View.Prelude + +import Application.Helper.Icons +import Web.Element.ElementWrap +import Web.Element.Types + + +render :: Text -> Html +render text = + text + |> cs + |> wrapHeaderTag 1 + + diff --git a/Web/Element/Quote.hs b/Web/Element/Quote.hs index ee140d1..dc599d5 100644 --- a/Web/Element/Quote.hs +++ b/Web/Element/Quote.hs @@ -1,4 +1,5 @@ module Web.Element.Quote where + import Web.View.Prelude import Application.Helper.Icons diff --git a/Web/View/StyleGuide/Index.hs b/Web/View/StyleGuide/Index.hs index 1a2c3c3..4cd73e1 100644 --- a/Web/View/StyleGuide/Index.hs +++ b/Web/View/StyleGuide/Index.hs @@ -4,6 +4,7 @@ import Web.Element.Types import Web.View.Prelude import Web.Element.Cta +import Web.Element.PageTitle import Web.Element.Quote data IndexView = IndexView { } @@ -34,11 +35,15 @@ instance View IndexView where -- All the elements to be displayed in the Style Guide. elements = - [ renderTitleAndElementNoContainer "CTA" cta + [ renderTitleAndElementWideContainer "Page Title" pageTitle + , renderTitleAndElementNoContainer "CTA" cta , renderTitleAndElementNoContainer "Quote" quote ] |> mconcat + pageTitle = "The source has extended, but not everyone fears it" + |> Web.Element.PageTitle.render + cta = RenderCta { title = "Hello, World!" , body = "This is a test of the __emergency__ broadcast system." @@ -52,7 +57,7 @@ instance View IndexView where quote = RenderQuote { body = "The quick brown fox jumps over the lazy dog" , subtitle = "An old proverb" - , imageUrl = "/styleGuideImages/kitten-with-wings.jpg" + , imageUrl = "/styleGuideImages/8f8827de-e5d4-4ee7-b0a3-abae36274338" } |> Web.Element.Quote.render diff --git a/static/styleGuideImages/kitten-with-wings.jpg b/static/styleGuideImages/8f8827de-e5d4-4ee7-b0a3-abae36274338 similarity index 100% rename from static/styleGuideImages/kitten-with-wings.jpg rename to static/styleGuideImages/8f8827de-e5d4-4ee7-b0a3-abae36274338 diff --git a/static/styleGuideImages/imageStyles/400x200/24f06c33-6247-4de9-9250-e468613317c8 b/static/styleGuideImages/imageStyles/400x200/24f06c33-6247-4de9-9250-e468613317c8 deleted file mode 100644 index f43205e..0000000 Binary files a/static/styleGuideImages/imageStyles/400x200/24f06c33-6247-4de9-9250-e468613317c8 and /dev/null differ diff --git a/static/styleGuideImages/imageStyles/400x200/aaf86ed1-c799-444e-9ea2-0864fc87324d b/static/styleGuideImages/imageStyles/400x200/aaf86ed1-c799-444e-9ea2-0864fc87324d deleted file mode 100644 index f43205e..0000000 Binary files a/static/styleGuideImages/imageStyles/400x200/aaf86ed1-c799-444e-9ea2-0864fc87324d and /dev/null differ