diff --git a/flake.lock b/flake.lock index 846d196..3bb6bbb 100755 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { diff --git a/frontend/src/Cuckery/Helpers.elm b/frontend/src/Cuckery/Helpers.elm index 806245c..c29f05c 100755 --- a/frontend/src/Cuckery/Helpers.elm +++ b/frontend/src/Cuckery/Helpers.elm @@ -18,13 +18,13 @@ import View exposing (View) makeDodge : Dodge -> Int -> Element msg makeDodge dodgeEntry index = column paragraphAlignLeft - [ row (paragraphFormat++[F.size 18]) + [ row (paragraphFormat ++ [ F.size 18 ]) [ text " " , text (String.fromInt index ++ ". ") , paragraphLinkFormat { url = dodgeEntry.dodgeLink , label = - row [F.size 18] + row [ F.size 18 ] [ transitionHighlightedLinkHover <| text (case dodgeEntry.dodgeDescription of @@ -122,14 +122,14 @@ cuckMaker cuck = , column paragraphAlignLeft [ row nonHighlightedTitleFormat [ text cuck.cuckName ] - , row (paragraphBoldFormat++[F.size 18]) + , row (paragraphBoldFormat ++ [ F.size 18 ]) [ text "Social:" , paragraphLinkFormat { url = cuck.cuckSocial , label = transitionHighlightedLinkHover <| text (formatCuckSocial cuck.cuckSocial) } ] - , row (paragraphBoldFormat++[F.size 18]) [ text "Dodges:" ] + , row (paragraphBoldFormat ++ [ F.size 18 ]) [ text "Dodges:" ] , column [ spacing 8 ] <| List.map2 (\x y -> makeDodge x y) cuck.cuckDodges diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index bbde02f..bc6a622 100755 --- a/frontend/src/Layouts/Navbar.elm +++ b/frontend/src/Layouts/Navbar.elm @@ -91,6 +91,12 @@ view { toContentMsg, model, content } = , alignLeft , alignTop , moveDown 30 + , htmlAttribute (H.style "position" "fixed") + , htmlAttribute (H.style "left" "0") + , htmlAttribute (H.style "top" "0") + , htmlAttribute (H.style "height" "100vh") + , htmlAttribute (H.style "z-index" "10") -- Ensure navbar stays on top + , htmlAttribute (H.style "transform-style" "preserve-3d") ] [ column [ spacing 20 @@ -107,8 +113,14 @@ view { toContentMsg, model, content } = , link navBarLinkFormat { url = localhostUrl ++ "support", label = transitionNonHighlightedLinkHoverWithMove <| text "SUPPORT" } , link navBarLinkFormat { url = localhostUrl ++ "interviews", label = transitionNonHighlightedLinkHoverWithMove <| text "INTERVIEWS" } , link navBarLinkFormat { url = localhostUrl ++ "contact", label = transitionNonHighlightedLinkHoverWithMove <| text "CONTACT" } + , link navBarLinkFormat { url = localhostUrl ++ "dodgers", label = transitionNonHighlightedLinkHoverWithMove <| text "DODGERS" } ] ] - , content.element + , el + [ width fill + , height fill + , paddingEach { top = 0, right = 0, bottom = 0, left = 200 } + ] + content.element ] } diff --git a/frontend/src/Pages/Debate.elm b/frontend/src/Pages/Debate.elm index e8a58bb..f0dca32 100755 --- a/frontend/src/Pages/Debate.elm +++ b/frontend/src/Pages/Debate.elm @@ -296,7 +296,8 @@ argumentList = , conclusionNotation = "" } ] - },{ argumentTitle = "" + } + , { argumentTitle = "" , propositionTitle = "" , propositionSummary = "" , definitionTable = diff --git a/frontend/src/Pages/Dodgers.elm b/frontend/src/Pages/Dodgers.elm index 3e04683..1f228d1 100755 --- a/frontend/src/Pages/Dodgers.elm +++ b/frontend/src/Pages/Dodgers.elm @@ -215,8 +215,8 @@ dodgersList = , cuckPhilippeStephenson , cuckRalphNapolitano , cuckRaphaelSirtoli - , cuckRobMeijer , cuckRobbWolf + , cuckRobMeijer , cuckSimonGoddek , cuckTravisStatham , cuckTristanHaggard