diff --git a/frontend/src/Config/Format/CardFormat.elm b/frontend/src/Config/Format/CardFormat.elm index 2e4e7f1..6a8b229 100755 --- a/frontend/src/Config/Format/CardFormat.elm +++ b/frontend/src/Config/Format/CardFormat.elm @@ -48,7 +48,7 @@ cardMaker = column [ E.width fill , D.width 5 - , centerX + , alignTop , D.color colourTheme.backgroundDarkGrey , D.rounded 32 , glowDeepDarkGrey diff --git a/frontend/src/Config/Format/Format.elm b/frontend/src/Config/Format/Format.elm index e555756..1d279a2 100755 --- a/frontend/src/Config/Format/Format.elm +++ b/frontend/src/Config/Format/Format.elm @@ -5,7 +5,7 @@ import Element.Font as F paragraphFontSize : Attr decorative msg paragraphFontSize = - F.size 17 + F.size 16 paragraphSpacing : Attribute msg diff --git a/frontend/src/Config/Format/Response.elm b/frontend/src/Config/Format/Response.elm index 57e9edc..193cddd 100755 --- a/frontend/src/Config/Format/Response.elm +++ b/frontend/src/Config/Format/Response.elm @@ -10,19 +10,30 @@ topLevelContainer = el [ width fill , height fill - , centerX , B.color colourTheme.backgroundLightGrey , height fill , scrollbarY ] -pageListDesktop : List (Attribute msg) -pageListDesktop = +pageList : List (Attribute msg) +pageList = + [ alignTop + ] + ++ pageListFormat + + +pageListCenter : List (Attribute msg) +pageListCenter = + [ centerY + ] + ++ pageListFormat + + +pageListFormat : List (Attribute msg) +pageListFormat = [ spacing 30 , centerX - , alignTop - , height fill , paddingEach { top = 30, bottom = 30, left = 30, right = 30 } , width (fill |> minimum 100) , width (fill |> maximum 875) diff --git a/frontend/src/Config/Helpers/StrengthBar.elm b/frontend/src/Config/Helpers/StrengthBar.elm index 64e7a10..47e71b7 100755 --- a/frontend/src/Config/Helpers/StrengthBar.elm +++ b/frontend/src/Config/Helpers/StrengthBar.elm @@ -1,7 +1,7 @@ module Config.Helpers.StrengthBar exposing (..) import Config.Helpers.ToolTip exposing (..) -import Config.Style.Colour exposing (..) +import Config.Style.Colour exposing (colourTheme) import Element as E exposing (..) import Element.Background as B import Element.Border as D diff --git a/frontend/src/Config/Helpers/ToolTip.elm b/frontend/src/Config/Helpers/ToolTip.elm index 14b1d07..8956a65 100755 --- a/frontend/src/Config/Helpers/ToolTip.elm +++ b/frontend/src/Config/Helpers/ToolTip.elm @@ -1,6 +1,6 @@ module Config.Helpers.ToolTip exposing (..) -import Config.Style.Colour exposing (..) +import Config.Style.Colour exposing (colourTheme) import Config.Style.Transitions exposing (transitionStyleSlow) import Element as E exposing (..) import Element.Background as B diff --git a/frontend/src/Config/Pages/Contact/Helpers.elm b/frontend/src/Config/Pages/Contact/Helpers.elm index ba94ca7..56fec7a 100755 --- a/frontend/src/Config/Pages/Contact/Helpers.elm +++ b/frontend/src/Config/Pages/Contact/Helpers.elm @@ -8,7 +8,7 @@ import Config.Helpers.StrengthBar , barPadding ) import Config.Helpers.ToolTip exposing (..) -import Config.Style.Colour exposing (..) +import Config.Style.Colour exposing (colourTheme) import Config.Style.Transitions exposing ( hoverFontDarkOrange diff --git a/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm b/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm index 912acdb..d8d6197 100755 --- a/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm +++ b/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm @@ -564,7 +564,7 @@ desktopFormalizationMaker argument = mobileFormalizationMaker : Argument -> Element msg mobileFormalizationMaker argument = - formalizationMaker argument argumentDesktopPadding + formalizationMaker argument argumentMobilePadding formalizationMaker : Argument -> Attribute msg -> Element msg @@ -603,10 +603,10 @@ formalizationMaker argument padding = ] [ text (if entryIndex < List.length argumentEntry.premises then - "P" ++ String.fromInt (entryIndex + 1) ++ ")" + "P" ++ String.fromInt (entryIndex + 1) ++ ") " else - "C)" + "C) " ) , text (if entryIndex < List.length argumentEntry.premises then @@ -619,12 +619,6 @@ formalizationMaker argument padding = [ F.color colourTheme.textLightGrey , F.regular , E.width fill - , paddingEach - { top = 0 - , right = 0 - , bottom = 0 - , left = 5 - } ] ] , paragraph diff --git a/frontend/src/Pages/Arguments.elm b/frontend/src/Pages/Arguments.elm index a2ffb1e..6422d46 100755 --- a/frontend/src/Pages/Arguments.elm +++ b/frontend/src/Pages/Arguments.elm @@ -3,7 +3,7 @@ module Pages.Arguments exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -105,7 +105,7 @@ debateList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/Contact.elm b/frontend/src/Pages/Contact.elm index c646fd0..3decbfd 100755 --- a/frontend/src/Pages/Contact.elm +++ b/frontend/src/Pages/Contact.elm @@ -3,7 +3,7 @@ module Pages.Contact exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -99,7 +99,7 @@ contactContainer device = contactList : Device -> Element msg contactList device = - column pageListDesktop <| + column pageList <| List.concat (case ( device.class, device.orientation ) of _ -> diff --git a/frontend/src/Pages/Cucklist.elm b/frontend/src/Pages/Cucklist.elm index 40d537d..eaddd6c 100755 --- a/frontend/src/Pages/Cucklist.elm +++ b/frontend/src/Pages/Cucklist.elm @@ -3,7 +3,7 @@ module Pages.Cucklist exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -100,7 +100,7 @@ dodgersList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/Debate.elm b/frontend/src/Pages/Debate.elm index 9277337..a218cdb 100755 --- a/frontend/src/Pages/Debate.elm +++ b/frontend/src/Pages/Debate.elm @@ -3,8 +3,9 @@ module Pages.Debate exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer + ) import Config.Helpers.Viewport exposing (resetViewport) import Config.Pages.Debate.Debate.Helpers exposing (..) @@ -103,7 +104,7 @@ debateList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/Donate.elm b/frontend/src/Pages/Donate.elm index f9bfaba..6d09bdd 100755 --- a/frontend/src/Pages/Donate.elm +++ b/frontend/src/Pages/Donate.elm @@ -1,8 +1,11 @@ module Pages.Donate exposing (Model, Msg, page) import Config.Data.Identity as I exposing (..) -import Config.Format.Format as O exposing (..) -import Config.Format.Response exposing (..) +import Config.Format.Response + exposing + ( pageList + , topLevelContainer + ) import Config.Helpers.Viewport exposing (..) import Config.Pages.Donate.Helpers exposing (..) import Config.Pages.Donate.Methods.Cardano exposing (donateCardano) @@ -14,11 +17,11 @@ import Config.Pages.Donate.Methods.PayPal exposing (donatePayPal) import Config.Pages.Donate.Methods.Stripe exposing (donateStripe) import Config.Pages.Donate.Methods.YouTube exposing (donateYouTube) import Config.Pages.Donate.Types exposing (..) +import Config.Pages.Headers.Helpers exposing (headerMaker) +import Config.Pages.Headers.Pages.Donate exposing (donateHeader) import Config.Style.Colour as T exposing (..) import Effect exposing (Effect) import Element as E exposing (..) -import Config.Pages.Headers.Helpers exposing (headerMaker) -import Config.Pages.Headers.Pages.Donate exposing (donateHeader) import Layouts import Page exposing (Page) import Route exposing (Route) @@ -108,7 +111,7 @@ donateList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/Gibberish.elm b/frontend/src/Pages/Gibberish.elm index 5000c6d..a16ac47 100755 --- a/frontend/src/Pages/Gibberish.elm +++ b/frontend/src/Pages/Gibberish.elm @@ -3,7 +3,7 @@ module Pages.Gibberish exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -113,7 +113,7 @@ gibberishList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/Home_.elm b/frontend/src/Pages/Home_.elm index b804474..177a669 100755 --- a/frontend/src/Pages/Home_.elm +++ b/frontend/src/Pages/Home_.elm @@ -3,7 +3,7 @@ module Pages.Home_ exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageListCenter , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -96,7 +96,7 @@ homeContainer device = homeList : Device -> Element msg homeList device = - column pageListDesktop + column pageListCenter [ case device.class of Desktop -> desktopHomePage diff --git a/frontend/src/Pages/Hyperblog.elm b/frontend/src/Pages/Hyperblog.elm index 1b844a9..8e98a4e 100755 --- a/frontend/src/Pages/Hyperblog.elm +++ b/frontend/src/Pages/Hyperblog.elm @@ -3,7 +3,7 @@ module Pages.Hyperblog exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -98,7 +98,7 @@ hyperBlogContainer device = hyperBlogList : Device -> Element msg hyperBlogList device = - column pageListDesktop <| + column pageList <| List.concat (case ( device.class, device.orientation ) of _ -> diff --git a/frontend/src/Pages/Interviews.elm b/frontend/src/Pages/Interviews.elm index b59028c..92d5760 100755 --- a/frontend/src/Pages/Interviews.elm +++ b/frontend/src/Pages/Interviews.elm @@ -3,7 +3,7 @@ module Pages.Interviews exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -109,7 +109,7 @@ interviewList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/NotFound_.elm b/frontend/src/Pages/NotFound_.elm index a68fc61..ac3467b 100755 --- a/frontend/src/Pages/NotFound_.elm +++ b/frontend/src/Pages/NotFound_.elm @@ -2,7 +2,7 @@ module Pages.NotFound_ exposing (Model, Msg, page) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Effect exposing (Effect) diff --git a/frontend/src/Pages/Nutridex.elm b/frontend/src/Pages/Nutridex.elm index 6f92868..dbefa65 100755 --- a/frontend/src/Pages/Nutridex.elm +++ b/frontend/src/Pages/Nutridex.elm @@ -3,7 +3,7 @@ module Pages.Nutridex exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -103,7 +103,7 @@ nutriDexList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/src/Pages/Services.elm b/frontend/src/Pages/Services.elm index 5605568..ec88a28 100755 --- a/frontend/src/Pages/Services.elm +++ b/frontend/src/Pages/Services.elm @@ -3,7 +3,7 @@ module Pages.Services exposing (Model, Msg, page) import Config.Data.Identity exposing (pageNames) import Config.Format.Response exposing - ( pageListDesktop + ( pageList , topLevelContainer ) import Config.Helpers.Viewport exposing (resetViewport) @@ -106,7 +106,7 @@ servicesList device = column (case ( device.class, device.orientation ) of _ -> - pageListDesktop + pageList ) <| List.concat diff --git a/frontend/static/debate/cucklist1.png b/frontend/static/debate/cucklist1.png new file mode 100644 index 0000000..1032bcb Binary files /dev/null and b/frontend/static/debate/cucklist1.png differ