From 31be063412c3252a3c86e6f9b9026512322db4d2 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 6 Dec 2024 02:13:22 -0600 Subject: [PATCH] feat: started working on responsiveness --- frontend/elm-land.json | 2 +- frontend/src/Debate/Gibberish/Helpers.elm | 26 +++ frontend/src/Home/Helpers.elm | 80 ++++++++++ frontend/src/Layouts/Navbar.elm | 26 +-- frontend/src/Pages/Arguments.elm | 184 ++++++++++++++-------- frontend/src/Pages/Gibberish.elm | 101 ++++++++---- frontend/src/Pages/Home_.elm | 74 ++++----- frontend/src/Products/Helpers.elm | 177 ++++++++------------- 8 files changed, 408 insertions(+), 262 deletions(-) create mode 100644 frontend/src/Home/Helpers.elm diff --git a/frontend/elm-land.json b/frontend/elm-land.json index b907ec8..b7d024f 100755 --- a/frontend/elm-land.json +++ b/frontend/elm-land.json @@ -20,7 +20,7 @@ } ], "link": [ - { "rel": "icon", "type": "png", "href": "/favicon.png" }, + { "rel": "icon", "type": "png", "href": "/assets/logo_lambda.png" }, { "rel": "stylesheet", "href": "/styles.css" }, { "rel": "stylesheet", diff --git a/frontend/src/Debate/Gibberish/Helpers.elm b/frontend/src/Debate/Gibberish/Helpers.elm index 4f4ff25..0487a52 100755 --- a/frontend/src/Debate/Gibberish/Helpers.elm +++ b/frontend/src/Debate/Gibberish/Helpers.elm @@ -49,6 +49,32 @@ gibberishMaker gibberish = ] +gibberishMakerMobile : Gibberish -> Element msg +gibberishMakerMobile gibberish = + row + topLevelBox + [ cardMaker + [ cardTitleMaker (gibberishTitle gibberish) + , cardFormatter + [ cardContentSpacing + [ column + fieldSpacer + [ paragraph + (paragraphFormat + ++ [ F.size 18 + , F.center + ] + ) + [ cardImageMakerMobile (gibberishImage gibberish) + , domainList gibberish + ] + ] + ] + ] + ] + ] + + gibberishImage : Gibberish -> { src : String, description : String } gibberishImage gibberish = { src = "gibberish/" ++ gibberish.gibberishImage ++ ".png" diff --git a/frontend/src/Home/Helpers.elm b/frontend/src/Home/Helpers.elm new file mode 100644 index 0000000..e44184b --- /dev/null +++ b/frontend/src/Home/Helpers.elm @@ -0,0 +1,80 @@ +module Home.Helpers exposing (..) + +import Blog.Helpers exposing (..) +import Config.Colour as T exposing (..) +import Config.Format as O exposing (..) +import Config.Identity as I exposing (..) +import Config.Response exposing (..) +import Config.Viewport exposing (..) +import Effect exposing (Effect) +import Element as E exposing (..) +import Element.Background as B exposing (..) +import Element.Border as D exposing (..) +import Element.Font as F +import Html.Attributes as H exposing (style) +import Layouts +import Page exposing (Page) +import Route exposing (Route) +import Shared exposing (..) +import View exposing (View) + + +homePage : { src : String, description : String } -> Element msg +homePage image = + column + [ centerX + , centerY + , spacing 20 + ] + [ row [ centerX ] + [ E.image [ E.width fill, height <| px 100 ] + image + ] + , column + [ paddingEach + { top = 15 + , bottom = 15 + , left = 20 + , right = 20 + } + , B.color colourTheme.backgroundDarkGrey + , rounded 10 + , E.width fill + , spacing 8 + ] + [ paragraph (paragraphFormat ++ [ centerX ]) [ text "upRootNutrition is an open source project, created by Nick Hiebert, designed to elevate the quality of nutrition science communication in online discourse. By applying more rigorous systems of reasoning, such as formal logic, upRootNutrition aims to cut through the misinformation and sophistry that are endemic on social media." ] + ] + ] + + +desktopHomePageImage : { src : String, description : String } +desktopHomePageImage = + { src = "assets/logo_extended.png" + , description = "" + } + + +desktopHomePage = + homePage desktopHomePageImage + + +mobileLargeHomePageImage : { src : String, description : String } +mobileLargeHomePageImage = + { src = "assets/logo.png" + , description = "" + } + + +mobileLargedesktopHomePage = + homePage mobileLargeHomePageImage + + +mobileSmallHomePageImage : { src : String, description : String } +mobileSmallHomePageImage = + { src = "assets/logo_lambda.png" + , description = "" + } + + +mobileSmallesktopHomePage = + homePage mobileSmallHomePageImage diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index eb090e5..6939285 100755 --- a/frontend/src/Layouts/Navbar.elm +++ b/frontend/src/Layouts/Navbar.elm @@ -157,19 +157,19 @@ view { content, model, toContentMsg, props } = , F.size 17 , spacing 8 ] - <| - List.map (buttonMaker props.currentRoute) - [ pageNames.pageRoot - , pageNames.pageServices - , pageNames.pageHyperBlog - , pageNames.pageDebate - , pageNames.pageGibberish - , pageNames.pageDodgers - , pageNames.pageNutriDex - , pageNames.pageInterviews - , pageNames.pageDonate - , pageNames.pageContact - ] + (buttonMaker props.currentRoute pageNames.pageRoot + :: List.map (buttonMaker props.currentRoute) + [ pageNames.pageServices + , pageNames.pageHyperBlog + , pageNames.pageDebate + , pageNames.pageGibberish + , pageNames.pageDodgers + , pageNames.pageNutriDex + , pageNames.pageInterviews + , pageNames.pageDonate + , pageNames.pageContact + ] + ) ] ] , footerIcons diff --git a/frontend/src/Pages/Arguments.elm b/frontend/src/Pages/Arguments.elm index 7099ac6..23a1c5f 100755 --- a/frontend/src/Pages/Arguments.elm +++ b/frontend/src/Pages/Arguments.elm @@ -3,6 +3,7 @@ module Pages.Arguments exposing (Model, Msg, page) import Config.Colour as T exposing (..) import Config.Format as O exposing (..) import Config.Identity as I exposing (..) +import Config.Response exposing (..) import Config.Viewport exposing (..) import Debate.Arguments.Abortion exposing (..) import Debate.Arguments.Agnosticism exposing (..) @@ -72,7 +73,6 @@ import Ports exposing (gotArgHeight) import Route exposing (Route) import Shared import View exposing (View) -import Config.Response exposing (..) page : Shared.Model -> Route () -> Page Model Msg @@ -81,7 +81,7 @@ page shared route = { init = init , update = update , subscriptions = subscriptions - , view = view + , view = view shared } |> Page.withLayout toLayout @@ -141,78 +141,124 @@ subscriptions model = -- VIEW -view : Model -> View Msg -view model = +view : Shared.Model -> Model -> View Msg +view shared model = { title = debateName , attributes = [] - , element = debateContainer + , element = debateContainer shared.device } -debateContainer : Element msg -debateContainer = - topLevelContainer debateList +debateContainer : Device -> Element msg +debateContainer device = + topLevelContainer (debateList device) -debateList : Element msg -debateList = - column [ centerX ] - [ column - pageListDesktop - <| - List.concat - [ List.map headerMaker - [ argumentHeader ] - , List.map argumentMaker - [ argumentApoBCVD - , argumentAnabolicKeto - , argumentAntagonisticPleiotropy - , argumentCarbsObesity - , argumentDietaryCholesterol - , argumentFructoseNAFLD - , argumentHealthPromotingFoods - , argumentHealthSeeker - , argumentHealthyChocolate - , argumentHealthyDairy - , argumentHealthyFattyFish - , argumentHealthyFibre - , argumentHealthyFood - , argumentHealthyPlantFoods - , argumentHealthySeedOils - , argumentHealthySoy - , argumentMalondialdehyde - , argumentOmega3Omega6Ratio - , argumentPlantBasedCVDReversal - , argumentPolyphenolReductio - , argumentSodiumCVD - , argumentTMAOCausality - , argumentUnhealthyCoconutOil - , argumentUnhealthyProcessedMeat - , argumentUnhealthyRedMeat - , argumentUnhealthySaturatedFat - , argumentAbortion - , argumentAgnosticism - , argumentAgriculturalPredation - , argumentAnimalRights - , argumentAntiRewilding - , argumentAntiVandalism - , argumentColonizingNature - , argumentCropDeaths - , argumentDairyCowRape - , argumentEfilismPatrolSquad - , argumentEthicalSlurs - , argumentFineTuning - , argumentImmortalityReductio - , argumentOddOrderPredators - , argumentOstroveganism - , argumentPollinationReductio - , argumentScratcherPioneers - , argumentTransPeople - , argumentVeganSocietyReductio - , argumentBoobyTrapPagers - , argumentEpidemiologyCausality - , argumentFlatEarthDebunk - , argumentTruncatedMeta - ] +debateList : Device -> Element msg +debateList device = + column + (case ( device.class, device.orientation ) of + ( Phone, Portrait ) -> + pageListDesktop + + ( Phone, Landscape ) -> + pageListDesktop + + ( Tablet, Portrait ) -> + pageListDesktop + + ( Tablet, Landscape ) -> + pageListDesktop + + ( Desktop, Portrait ) -> + pageListDesktop + + ( Desktop, Landscape ) -> + pageListDesktop + + ( BigDesktop, Portrait ) -> + pageListDesktop + + ( BigDesktop, Landscape ) -> + pageListDesktop + ) + <| + List.concat + [ List.map headerMaker + [ argumentHeader ] + , (case ( device.class, device.orientation ) of + ( Phone, Portrait ) -> + List.map argumentMakerMobile + + ( Phone, Landscape ) -> + List.map argumentMakerMobile + + ( Tablet, Portrait ) -> + List.map argumentMakerMobile + + ( Tablet, Landscape ) -> + List.map argumentMakerMobile + + ( Desktop, Portrait ) -> + List.map argumentMaker + + ( Desktop, Landscape ) -> + List.map argumentMaker + + ( BigDesktop, Portrait ) -> + List.map argumentMaker + + ( BigDesktop, Landscape ) -> + List.map argumentMaker + ) + [ argumentApoBCVD + , argumentAnabolicKeto + , argumentAntagonisticPleiotropy + , argumentCarbsObesity + , argumentDietaryCholesterol + , argumentFructoseNAFLD + , argumentHealthPromotingFoods + , argumentHealthSeeker + , argumentHealthyChocolate + , argumentHealthyDairy + , argumentHealthyFattyFish + , argumentHealthyFibre + , argumentHealthyFood + , argumentHealthyPlantFoods + , argumentHealthySeedOils + , argumentHealthySoy + , argumentMalondialdehyde + , argumentOmega3Omega6Ratio + , argumentPlantBasedCVDReversal + , argumentPolyphenolReductio + , argumentSodiumCVD + , argumentTMAOCausality + , argumentUnhealthyCoconutOil + , argumentUnhealthyProcessedMeat + , argumentUnhealthyRedMeat + , argumentUnhealthySaturatedFat + , argumentAbortion + , argumentAgnosticism + , argumentAgriculturalPredation + , argumentAnimalRights + , argumentAntiRewilding + , argumentAntiVandalism + , argumentColonizingNature + , argumentCropDeaths + , argumentDairyCowRape + , argumentEfilismPatrolSquad + , argumentEthicalSlurs + , argumentFineTuning + , argumentImmortalityReductio + , argumentOddOrderPredators + , argumentOstroveganism + , argumentPollinationReductio + , argumentScratcherPioneers + , argumentTransPeople + , argumentVeganSocietyReductio + , argumentBoobyTrapPagers + , argumentEpidemiologyCausality + , argumentFlatEarthDebunk + , argumentTruncatedMeta ] - ] + ] diff --git a/frontend/src/Pages/Gibberish.elm b/frontend/src/Pages/Gibberish.elm index 85d0240..60f2dcb 100755 --- a/frontend/src/Pages/Gibberish.elm +++ b/frontend/src/Pages/Gibberish.elm @@ -3,6 +3,7 @@ module Pages.Gibberish exposing (Model, Msg, page) import Config.Colour as T exposing (..) import Config.Format as O exposing (..) import Config.Identity as I exposing (..) +import Config.Response exposing (..) import Config.Viewport exposing (..) import Debate.Gibberish.Domains.Epistemology exposing (epistemologyGibberish) import Debate.Gibberish.Domains.Metaphysics exposing (metaphysicsGibberish) @@ -29,7 +30,7 @@ import Ports exposing (gotArgHeight) import Route exposing (Route) import Shared import View exposing (View) -import Config.Response exposing (..) + page : Shared.Model -> Route () -> Page Model Msg page shared route = @@ -37,7 +38,7 @@ page shared route = { init = init , update = update , subscriptions = subscriptions - , view = view + , view = view shared } |> Page.withLayout toLayout @@ -97,36 +98,82 @@ subscriptions model = -- VIEW -view : Model -> View Msg -view model = +view : Shared.Model -> Model -> View Msg +view shared model = { title = gibberishName , attributes = [] - , element = gibberishContainer + , element = gibberishContainer shared.device } -gibberishContainer : Element msg -gibberishContainer = - topLevelContainer gibberishList +gibberishContainer : Device -> Element msg +gibberishContainer device = + topLevelContainer (gibberishList device) -gibberishList : Element msg -gibberishList = - column [ centerX ] - [ column - pageListDesktop - <| - List.concat - [ List.map headerMaker - [ gibberishHeader ] - , List.map gibberishMaker - [ epistemologyGibberish - , theologyGibberish - , metaphysicsGibberish - , normativityGibberish - , ontologyGibberish - , philOfMindGibberish - , philOfLanguageGibberish - ] +gibberishList : Device -> Element msg +gibberishList device = + column + (case ( device.class, device.orientation ) of + ( Phone, Portrait ) -> + pageListDesktop + + ( Phone, Landscape ) -> + pageListDesktop + + ( Tablet, Portrait ) -> + pageListDesktop + + ( Tablet, Landscape ) -> + pageListDesktop + + ( Desktop, Portrait ) -> + pageListDesktop + + ( Desktop, Landscape ) -> + pageListDesktop + + ( BigDesktop, Portrait ) -> + pageListDesktop + + ( BigDesktop, Landscape ) -> + pageListDesktop + ) + <| + List.concat + [ List.map headerMaker + [ gibberishHeader ] + , (case ( device.class, device.orientation ) of + ( Phone, Portrait ) -> + List.map gibberishMakerMobile + + ( Phone, Landscape ) -> + List.map gibberishMakerMobile + + ( Tablet, Portrait ) -> + List.map gibberishMakerMobile + + ( Tablet, Landscape ) -> + List.map gibberishMakerMobile + + ( Desktop, Portrait ) -> + List.map gibberishMaker + + ( Desktop, Landscape ) -> + List.map gibberishMaker + + ( BigDesktop, Portrait ) -> + List.map gibberishMaker + + ( BigDesktop, Landscape ) -> + List.map gibberishMaker + ) + [ epistemologyGibberish + , theologyGibberish + , metaphysicsGibberish + , normativityGibberish + , ontologyGibberish + , philOfMindGibberish + , philOfLanguageGibberish ] - ] + ] diff --git a/frontend/src/Pages/Home_.elm b/frontend/src/Pages/Home_.elm index cc3dac0..fb00d41 100755 --- a/frontend/src/Pages/Home_.elm +++ b/frontend/src/Pages/Home_.elm @@ -4,19 +4,21 @@ import Blog.Helpers exposing (..) import Config.Colour as T exposing (..) import Config.Format as O exposing (..) import Config.Identity as I exposing (..) +import Config.Response exposing (..) import Config.Viewport exposing (..) import Effect exposing (Effect) import Element as E exposing (..) import Element.Background as B exposing (..) import Element.Border as D exposing (..) import Element.Font as F +import Home.Helpers exposing (..) import Html.Attributes as H exposing (style) import Layouts import Page exposing (Page) import Route exposing (Route) import Shared exposing (..) import View exposing (View) -import Config.Response exposing (..) + page : Shared.Model -> Route () -> Page Model Msg page shared route = @@ -24,7 +26,7 @@ page shared route = { init = init , update = update , subscriptions = subscriptions - , view = view + , view = view shared } |> Page.withLayout toLayout @@ -81,46 +83,44 @@ subscriptions model = -- VIEW -view : Model -> View Msg -view model = +view : Shared.Model -> Model -> View Msg +view shared model = { title = "" , attributes = [] - , element = homeContainer + , element = homeContainer shared.device } -homeContainer : Element msg -homeContainer = - topLevelContainer homeList +homeContainer : Device -> Element msg +homeContainer device = + topLevelContainer (homeList device) -homeList : Element msg -homeList = +homeList : Device -> Element msg +homeList device = column pageListDesktop - [ column - [ centerX - , centerY - , spacing 20 - ] - [ row [ centerX ] - [ E.image [ E.width <| px 785 ] - { src = "assets/logo_extended.png" - , description = "" - } - ] - , column - [ paddingEach - { top = 15 - , bottom = 15 - , left = 20 - , right = 20 - } - , B.color colourTheme.backgroundDarkGrey - , rounded 10 - , E.width fill - , spacing 8 - ] - [ paragraph (paragraphFormat ++ [ centerX ]) [ text "upRootNutrition is an open source project, created by Nick Hiebert, designed to elevate the quality of nutrition science communication in online discourse. By applying more rigorous systems of reasoning, such as formal logic, upRootNutrition aims to cut through the misinformation and sophistry that are endemic on social media." ] - ] - ] - ] + (case ( device.class, device.orientation ) of + ( Phone, Portrait ) -> + [mobileSmallesktopHomePage] + + ( Phone, Landscape ) -> + [mobileSmallesktopHomePage] + + ( Tablet, Portrait ) -> + [mobileLargedesktopHomePage] + + ( Tablet, Landscape ) -> + [mobileLargedesktopHomePage] + + ( Desktop, Portrait ) -> + [ desktopHomePage ] + + ( Desktop, Landscape ) -> + [ desktopHomePage ] + + ( BigDesktop, Portrait ) -> + [ desktopHomePage ] + + ( BigDesktop, Landscape ) -> + [ desktopHomePage ] + ) diff --git a/frontend/src/Products/Helpers.elm b/frontend/src/Products/Helpers.elm index 9ae077e..06ef3a3 100755 --- a/frontend/src/Products/Helpers.elm +++ b/frontend/src/Products/Helpers.elm @@ -35,7 +35,6 @@ nutriDexMaker nutridex = fieldSpacer [ cardSubTitleMaker [ featureList nutridex - , nutriDexTitleMaker , nutriDexBodyMaker , nutriDexAdjustments , column [ spacing 10 ] @@ -66,7 +65,6 @@ nutriDexMakerMobile nutridex = fieldSpacer [ cardSubTitleMaker [ featureListMobile nutridex - , nutriDexTitleMaker , nutriDexBodyMaker , nutriDexAdjustments , column [ spacing 10 ] @@ -272,8 +270,8 @@ featureListMobile nutridex = ] -nutriDexTitleMaker : Element msg -nutriDexTitleMaker = +nutriDexTitleMaker : String -> Element msg +nutriDexTitleMaker title = column [ width fill , height fill @@ -300,7 +298,7 @@ nutriDexTitleMaker = } ] ) - [ text "Backstory" ] + [ text title ] ] @@ -318,7 +316,8 @@ nutriDexBodyMaker = , height fill ] [ column [ spacing 10 ] - [ row [] + [ nutriDexTitleMaker "Backstory" + , row [] [ paragraph (paragraphFormat ++ [ F.alignLeft @@ -392,87 +391,67 @@ nutriDexAdjustments = column [ width fill , height fill + , spacing 20 ] - [ column - [ width fill - , height fill - , spacing 20 - ] - [ row - [ width fill - , centerX - , D.widthEach { bottom = 1, top = 0, left = 0, right = 0 } - , D.color (rgb255 200 200 200) - , paddingEach { top = 40, bottom = 0, left = 0, right = 0 } - ] - [] - , column [ spacing 10 ] - [ row - [ centerX - , paddingEach - { top = 10 - , right = 0 - , bottom = 10 - , left = 0 + [ nutriDexTitleMaker "Nutrient Density Score Adjustments" + , row [] + [ paragraph (paragraphFormat ++ [ F.alignLeft, width fill ]) + [ text "• " + , text "No adjustments are made to vitamin B1, vitamin B2, vitamin B3, manganese, phosphorus, and potassium, due to their DRIs only representing total daily intake, or due to the nutrient having close to 100% bioavailability. " + , row [ F.regular, F.size 12 ] + [ newTabLink referenceFormat + { url = "https://www.ncbi.nlm.nih.gov/books/NBK114331/" + , label = text "1" + } + , text ", " + , newTabLink referenceFormat + { url = "https://www.ncbi.nlm.nih.gov/books/NBK114322/" + , label = text "2" + } + , text ", " + , newTabLink referenceFormat + { url = "https://www.ncbi.nlm.nih.gov/books/NBK114304/" + , label = text "3" + } + , text ", " + , newTabLink referenceFormat + { url = "https://www.ncbi.nlm.nih.gov/books/NBK56056/" + , label = text "4" + } + , text ", " + , newTabLink referenceFormat + { url = "https://www.nap.edu/read/11537/chapter/39" + , label = text "5" + } + , text ", " + , newTabLink referenceFormat + { url = "https://www.nap.edu/read/11537/chapter/41" + , label = text "6" + } + , text ", " + , newTabLink referenceFormat + { url = "https://www.nap.edu/read/11537/chapter/42" + , label = text "7" } ] - [ paragraph - (paragraphBoldFormat - ++ [ F.alignLeft - , width fill - , F.size 18 - , F.color colourTheme.textLightOrange - ] - ) - [ text "Nutrient Density Score Adjustments" ] - ] - , row [] - [ paragraph (paragraphFormat ++ [ F.alignLeft, width fill ]) - [ text "• " - , text "No adjustments are made to vitamin B1, vitamin B2, vitamin B3, manganese, phosphorus, and potassium, due to their DRIs only representing total daily intake, or due to the nutrient having close to 100% bioavailability. " - , row [ F.regular, F.size 12 ] - [ newTabLink referenceFormat - { url = "https://www.ncbi.nlm.nih.gov/books/NBK114331/" - , label = text "1" - } - , text ", " - , newTabLink referenceFormat - { url = "https://www.ncbi.nlm.nih.gov/books/NBK114322/" - , label = text "2" - } - , text ", " - , newTabLink referenceFormat - { url = "https://www.ncbi.nlm.nih.gov/books/NBK114304/" - , label = text "3" - } - , text ", " - , newTabLink referenceFormat - { url = "https://www.ncbi.nlm.nih.gov/books/NBK56056/" - , label = text "4" - } - , text ", " - , newTabLink referenceFormat - { url = "https://www.nap.edu/read/11537/chapter/39" - , label = text "5" - } - , text ", " - , newTabLink referenceFormat - { url = "https://www.nap.edu/read/11537/chapter/41" - , label = text "6" - } - , text ", " - , newTabLink referenceFormat - { url = "https://www.nap.edu/read/11537/chapter/42" - , label = text "7" - } - ] - ] - ] ] ] ] +nutridexSubTitleMaker : String -> Element msg +nutridexSubTitleMaker title = + paragraph + (paragraphBoldFormat + ++ [ F.alignLeft + , width fill + , F.size 18 + , F.color colourTheme.textLightOrange + ] + ) + [ text title ] + + nutriDexVitamins : Element msg nutriDexVitamins = column @@ -489,15 +468,7 @@ nutriDexVitamins = , left = 0 } ] - [ paragraph - (paragraphBoldFormat - ++ [ F.alignLeft - , width fill - , F.size 18 - , F.color colourTheme.textLightOrange - ] - ) - [ text "Vitamins" ] + [ nutridexSubTitleMaker "Vitamins" ] , row [] [ paragraph (paragraphFormat ++ [ F.alignLeft, width fill ]) @@ -627,15 +598,7 @@ nutriDexFattyAcids = , left = 0 } ] - [ paragraph - (paragraphBoldFormat - ++ [ F.alignLeft - , width fill - , F.size 18 - , F.color colourTheme.textLightOrange - ] - ) - [ text "Fatty Acids" ] + [ nutridexSubTitleMaker "Fatty Acids" ] , row [] [ paragraph (paragraphFormat ++ [ F.alignLeft, width fill ]) @@ -698,15 +661,7 @@ nutriDexMinerals = , left = 0 } ] - [ paragraph - (paragraphBoldFormat - ++ [ F.alignLeft - , width fill - , F.size 18 - , F.color colourTheme.textLightOrange - ] - ) - [ text "Minerals" ] + [ nutridexSubTitleMaker "Minerals" ] , row [] [ paragraph (paragraphFormat ++ [ F.alignLeft, width fill ]) @@ -806,15 +761,7 @@ nutriDexAminoAcids = , left = 0 } ] - [ paragraph - (paragraphBoldFormat - ++ [ F.alignLeft - , width fill - , F.size 18 - , F.color colourTheme.textLightOrange - ] - ) - [ text "Amino Acids" ] + [ nutridexSubTitleMaker "Amino Acids" ] , row [] [ paragraph (paragraphFormat ++ [ F.alignLeft, width fill ])