diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/autogen/PackageInfo_example.hs b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/autogen/PackageInfo_example.hs old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/autogen/Paths_example.hs b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/autogen/Paths_example.hs old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/autogen/cabal_macros.h b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/autogen/cabal_macros.h old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/main-tmp/Main.hi b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/main-tmp/Main.hi old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/main-tmp/Main.o b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/build/main/main-tmp/Main.o old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/cache/build b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/cache/build old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/cache/config b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/cache/config old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/cache/registration b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/cache/registration old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/package.conf.inplace/package.cache b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/package.conf.inplace/package.cache old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/package.conf.inplace/package.cache.lock b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/package.conf.inplace/package.cache.lock old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/setup-config b/backend/dist-newstyle/build/x86_64-linux/ghc-9.6.6/example-0.1.0.0/x/main/setup-config old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/compiler b/backend/dist-newstyle/cache/compiler old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/config b/backend/dist-newstyle/cache/config old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/elaborated-plan b/backend/dist-newstyle/cache/elaborated-plan old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/improved-plan b/backend/dist-newstyle/cache/improved-plan old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/plan.json b/backend/dist-newstyle/cache/plan.json old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/solver-plan b/backend/dist-newstyle/cache/solver-plan old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/source-hashes b/backend/dist-newstyle/cache/source-hashes old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/cache/up-to-date b/backend/dist-newstyle/cache/up-to-date old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/packagedb/ghc-9.6.6/package.cache b/backend/dist-newstyle/packagedb/ghc-9.6.6/package.cache old mode 100644 new mode 100755 diff --git a/backend/dist-newstyle/packagedb/ghc-9.6.6/package.cache.lock b/backend/dist-newstyle/packagedb/ghc-9.6.6/package.cache.lock old mode 100644 new mode 100755 diff --git a/frontend/src/Config/Format.elm b/frontend/src/Config/Format.elm index e3e03ed..a1eae4c 100755 --- a/frontend/src/Config/Format.elm +++ b/frontend/src/Config/Format.elm @@ -16,6 +16,8 @@ topLevelContainer = , height fill , centerX , B.color colourTheme.backgroundLightGrey + , E.height E.fill + , scrollbarY ] diff --git a/frontend/src/Config/Identity.elm b/frontend/src/Config/Identity.elm index d1681c2..73fe064 100755 --- a/frontend/src/Config/Identity.elm +++ b/frontend/src/Config/Identity.elm @@ -19,7 +19,7 @@ type alias PageInput = pageNames : PageInput pageNames = { pageRoot = "home" - , pageHome = "upRootNutrition" + , pageHome = "uRN" , pageServices = "services" , pageDodgers = "cuckList" , pageDebate = "arguments" diff --git a/frontend/src/Config/Response.elm b/frontend/src/Config/Response.elm old mode 100644 new mode 100755 index c59a1f3..e3022eb --- a/frontend/src/Config/Response.elm +++ b/frontend/src/Config/Response.elm @@ -18,4 +18,5 @@ pageListDesktop = , paddingEach { top = 30, bottom = 30, left = 30, right = 30 } , E.width (fill |> minimum 100) , E.width (fill |> maximum 875) - ] \ No newline at end of file + , scrollbarY + ] diff --git a/frontend/src/Contact/Helpers.elm b/frontend/src/Contact/Helpers.elm index 7378236..866186c 100755 --- a/frontend/src/Contact/Helpers.elm +++ b/frontend/src/Contact/Helpers.elm @@ -67,7 +67,7 @@ descriptionMaker contact = [ width fill , height fill ] - [ column [ width fill, F.size 15, spacing 10 ] <| + [ paragraph [ width fill, F.size 15, spacing 10 ] <| List.map makeDescription contact.contactEntry ] @@ -79,19 +79,17 @@ makeDescription method = [ F.regular , F.alignLeft ] - [ row [] - [ paragraph - [ F.color colourTheme.textLightGrey - ] - [ text method.contactInstructions - ] + [ paragraph + [ F.color colourTheme.textLightGrey + ] + [ text method.contactInstructions ] ] linkMaker : Contact -> Element msg linkMaker contact = - row + paragraph (paragraphBoldFormat ++ [ F.size 18 , spacing 8 @@ -277,7 +275,7 @@ rounding = termsAndConditions : List (List (Element msg)) termsAndConditions = - [ [ row [ alignLeft ] + [ [ paragraph [ alignLeft ] [ text "You will register an account with " , newTabLink [] { url = "https://discord.com/login" @@ -296,7 +294,7 @@ termsAndConditions = ] ] , [ el [ alignLeft ] <| text "You will click the \"😃\" emoji to enter the server (if you haven't already)." ] - , [ row [ alignLeft ] + , [ paragraph [ alignLeft ] [ text "You will locate the " , newTabLink [] { url = "https://discord.com/channels/692563032546476062/826225570219687956" @@ -323,7 +321,7 @@ termsAndConditions = } , alignLeft ] - [ column + [ paragraph [ paddingEach { top = 15 , bottom = 15 @@ -341,7 +339,7 @@ termsAndConditions = ] ] , [ el [ alignLeft ] <| text "You will then receive the @Critic role." ] - , [ row [ alignLeft ] + , [ paragraph [ alignLeft ] [ text "You will locate the " , newTabLink [] { url = "https://discord.com/channels/692563032546476062/1301247050796634182" @@ -350,7 +348,7 @@ termsAndConditions = , text " channel in the General category." ] ] - , [ row [ alignLeft ] + , [ paragraph [ alignLeft ] [ paragraph [ F.alignLeft ] [ text "You will post your criticism in the " , newTabLink [] @@ -417,7 +415,7 @@ termsAndConditions = ] ] , [ el [ alignLeft ] <| text "You will not post additional criticisms until the last one has been resolved." ] - , [ row [ alignLeft ] + , [ paragraph [ alignLeft ] [ text "You will not post anything other than criticisms in the " , newTabLink [ alignLeft ] { url = "https://discord.com/channels/692563032546476062/1301247050796634182" diff --git a/frontend/src/Home/Helpers.elm b/frontend/src/Home/Helpers.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index 6939285..3eeded5 100755 --- a/frontend/src/Layouts/Navbar.elm +++ b/frontend/src/Layouts/Navbar.elm @@ -18,7 +18,7 @@ import View exposing (View) type alias Props = - { currentRoute : String } + {} layout : Props -> Shared.Model -> Route () -> Layout () Model Msg contentMsg @@ -95,6 +95,8 @@ view { content, model, toContentMsg, props } = [ E.width fill , height fill , B.color colourTheme.backgroundDarkGrey + , E.height E.fill + , scrollbarY ] [ column [ htmlAttribute (H.style "position" "fixed") @@ -157,8 +159,8 @@ view { content, model, toContentMsg, props } = , F.size 17 , spacing 8 ] - (buttonMaker props.currentRoute pageNames.pageRoot - :: List.map (buttonMaker props.currentRoute) + (buttonMaker pageNames.pageRoot + :: List.map buttonMaker [ pageNames.pageServices , pageNames.pageHyperBlog , pageNames.pageDebate @@ -241,8 +243,8 @@ iconList = ] -buttonMaker : String -> String -> Element msg -buttonMaker currentRoute name = +buttonMaker : String -> Element msg +buttonMaker name = row [] [ column [ E.width <| px 36 ] @@ -263,12 +265,7 @@ buttonMaker currentRoute name = , label = el [ mouseOver [ F.color colourTheme.textLightOrange ] - , F.color <| - if String.toLower name == currentRoute then - colourTheme.textLightOrange - - else - colourTheme.textLightGrey + , F.color colourTheme.textLightGrey , htmlAttribute <| style "transition" "all 0.1s ease-in-out" ] <| diff --git a/frontend/src/Pages/Arguments.elm b/frontend/src/Pages/Arguments.elm index 23a1c5f..4d3a8af 100755 --- a/frontend/src/Pages/Arguments.elm +++ b/frontend/src/Pages/Arguments.elm @@ -88,7 +88,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = debateName } + Layouts.Navbar { } diff --git a/frontend/src/Pages/Contact.elm b/frontend/src/Pages/Contact.elm index 333be7c..4a0ce5a 100755 --- a/frontend/src/Pages/Contact.elm +++ b/frontend/src/Pages/Contact.elm @@ -35,7 +35,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = contactName } + Layouts.Navbar { } @@ -104,25 +104,25 @@ contactList device = List.concat (case ( device.class, device.orientation ) of ( Phone, Portrait ) -> - [ [] ] + [ [ instructionMaker ] ] ( Phone, Landscape ) -> - [ [instructionMaker] ] + [ [ instructionMaker ] ] ( Tablet, Portrait ) -> - [ [instructionMaker] ] + [ [ instructionMaker ] ] ( Tablet, Landscape ) -> - [ [instructionMaker] ] + [ [ instructionMaker ] ] ( Desktop, Portrait ) -> - [ [instructionMaker] ] + [ [ instructionMaker ] ] ( Desktop, Landscape ) -> - [ [instructionMaker] ] + [ [ instructionMaker ] ] ( BigDesktop, Portrait ) -> - [ [instructionMaker] ] + [ [ instructionMaker ] ] ( BigDesktop, Landscape ) -> [ [ instructionMaker ] ] diff --git a/frontend/src/Pages/Cucklist.elm b/frontend/src/Pages/Cucklist.elm index 5a200a7..ebf510a 100755 --- a/frontend/src/Pages/Cucklist.elm +++ b/frontend/src/Pages/Cucklist.elm @@ -99,7 +99,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = dodgersName } + Layouts.Navbar { } diff --git a/frontend/src/Pages/Donate.elm b/frontend/src/Pages/Donate.elm index e35eb61..fc3b010 100755 --- a/frontend/src/Pages/Donate.elm +++ b/frontend/src/Pages/Donate.elm @@ -44,7 +44,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = donateName } + Layouts.Navbar {} diff --git a/frontend/src/Pages/Gibberish.elm b/frontend/src/Pages/Gibberish.elm index 60f2dcb..af13482 100755 --- a/frontend/src/Pages/Gibberish.elm +++ b/frontend/src/Pages/Gibberish.elm @@ -45,7 +45,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = donateName } + Layouts.Navbar { } diff --git a/frontend/src/Pages/Home_.elm b/frontend/src/Pages/Home_.elm index fb00d41..d109402 100755 --- a/frontend/src/Pages/Home_.elm +++ b/frontend/src/Pages/Home_.elm @@ -33,7 +33,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = homeName } + Layouts.Navbar { } diff --git a/frontend/src/Pages/Hyperblog.elm b/frontend/src/Pages/Hyperblog.elm index fbad468..814b55c 100755 --- a/frontend/src/Pages/Hyperblog.elm +++ b/frontend/src/Pages/Hyperblog.elm @@ -30,7 +30,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar {currentRoute = hyperBlogName} + Layouts.Navbar {} diff --git a/frontend/src/Pages/Interviews.elm b/frontend/src/Pages/Interviews.elm index ea30764..eb739cf 100755 --- a/frontend/src/Pages/Interviews.elm +++ b/frontend/src/Pages/Interviews.elm @@ -44,7 +44,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = interviewsName } + Layouts.Navbar { } diff --git a/frontend/src/Pages/Nutridex.elm b/frontend/src/Pages/Nutridex.elm index 015ba05..849e78c 100755 --- a/frontend/src/Pages/Nutridex.elm +++ b/frontend/src/Pages/Nutridex.elm @@ -39,7 +39,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = nutriDexName } + Layouts.Navbar { } diff --git a/frontend/src/Pages/Services.elm b/frontend/src/Pages/Services.elm index 92b4675..60974ec 100755 --- a/frontend/src/Pages/Services.elm +++ b/frontend/src/Pages/Services.elm @@ -37,7 +37,7 @@ page shared route = toLayout : Model -> Layouts.Layout Msg toLayout model = - Layouts.Navbar { currentRoute = servicesName } + Layouts.Navbar {} diff --git a/frontend/src/Products/Helpers.elm b/frontend/src/Products/Helpers.elm index 06ef3a3..ffb02e4 100755 --- a/frontend/src/Products/Helpers.elm +++ b/frontend/src/Products/Helpers.elm @@ -43,7 +43,6 @@ nutriDexMaker nutridex = , nutriDexMinerals , nutriDexAminoAcids ] - , nutriDexReferenceTitleMaker , nutriDexReferences nutridex ] ] @@ -73,7 +72,6 @@ nutriDexMakerMobile nutridex = , nutriDexMinerals , nutriDexAminoAcids ] - , nutriDexReferenceTitleMaker , nutriDexReferences nutridex ] ] @@ -276,6 +274,7 @@ nutriDexTitleMaker title = [ width fill , height fill , spacing 20 + , paddingEach { top = 0, bottom = 0, left = 100, right = 100 } ] [ row [ width fill @@ -829,7 +828,8 @@ nutriDexReferences nutridex = [ width fill , height fill ] - [ column [ width fill, F.size 15, spacing 10 ] <| + [ nutriDexTitleMaker "Reference" + , column [ width fill, F.size 15, spacing 10 ] <| List.map2 (\x y -> makeReference x y) nutridex.nutriDexReference (List.range 1 (List.length nutridex.nutriDexReference)) diff --git a/frontend/static/assets/logo.png b/frontend/static/assets/logo.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_extended.png b/frontend/static/assets/logo_extended.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_lambda.png b/frontend/static/assets/logo_lambda.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_lambda_square.png b/frontend/static/assets/logo_lambda_square.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_r.png b/frontend/static/assets/logo_r.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_r_square.png b/frontend/static/assets/logo_r_square.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_u.png b/frontend/static/assets/logo_u.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/logo_u_square.png b/frontend/static/assets/logo_u_square.png old mode 100644 new mode 100755 diff --git a/frontend/static/assets/nutridex.png b/frontend/static/assets/nutridex.png old mode 100644 new mode 100755 diff --git a/frontend/static/styles.css b/frontend/static/styles.css old mode 100644 new mode 100755