diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index 63f3c11..e66205a 100755 --- a/frontend/src/Layouts/Navbar.elm +++ b/frontend/src/Layouts/Navbar.elm @@ -116,16 +116,16 @@ navbarContainer device content = ] (case ( device.class, device.orientation ) of ( Phone, Portrait ) -> - [ mobileNavbar, mobileFooterIcons ] + [ mobileIconMaker, mobileNavbar, mobileFooterIcons ] ( Phone, Landscape ) -> - [ mobileNavbar, mobileFooterIcons ] + [ mobileIconMaker, mobileNavbar, mobileFooterIcons ] ( Tablet, Portrait ) -> - [ mobileNavbar, mobileFooterIcons ] + [ mobileIconMaker, mobileNavbar, mobileFooterIcons ] _ -> - [ desktopNavbar, desktopFooterIcons ] + [ desktopIconMaker, desktopNavbar, desktopFooterIcons ] ) , el [ E.width fill @@ -171,46 +171,9 @@ desktopNavbar = [ alignLeft , height fill , F.color colourTheme.textLightGrey + , scrollbarY ] [ column - [ centerX - , E.width <| px desktopBarWidth - ] - [ row - (nonHighlightedTitleFormat - ++ [ centerX - ] - ) - [ E.image - [ spacing 2 - , E.width <| px 140 - , centerX - , paddingEach - { top = 20 - , right = 0 - , bottom = 20 - , left = 0 - } - ] - { src = "assets/logo.png" - , description = "" - } - ] - , el - [ E.width <| px 140 - , alignTop - , centerX - , D.widthEach - { bottom = 1 - , top = 0 - , left = 0 - , right = 0 - } - , D.color colourTheme.textDarkGrey - ] - none - ] - , column [ padding 20, alignTop, alignLeft ] [ column [ F.bold @@ -233,6 +196,90 @@ desktopNavbar = ] +desktopIconMaker : Element msg +desktopIconMaker = + column + [ centerX + , E.width <| px desktopBarWidth + ] + [ row + (nonHighlightedTitleFormat + ++ [ centerX + ] + ) + [ E.image + [ spacing 2 + , E.width <| px 140 + , centerX + , paddingEach + { top = 20 + , right = 0 + , bottom = 20 + , left = 0 + } + ] + { src = "assets/logo.png" + , description = "" + } + ] + , el + [ E.width <| px 140 + , alignTop + , centerX + , D.widthEach + { bottom = 1 + , top = 0 + , left = 0 + , right = 0 + } + , D.color colourTheme.textDarkGrey + ] + none + ] + + +mobileIconMaker : Element msg +mobileIconMaker = + column + [ centerX + , E.width <| px mobileBarWidth + ] + [ row + (nonHighlightedTitleFormat + ++ [ centerX + ] + ) + [ E.image + [ spacing 2 + , E.width <| px 35 + , centerX + , paddingEach + { top = 10 + , right = 0 + , bottom = 10 + , left = 0 + } + ] + { src = "assets/logo_lambda.png" + , description = "" + } + ] + , el + [ E.width <| px 20 + , alignTop + , centerX + , D.widthEach + { bottom = 1 + , top = 0 + , left = 0 + , right = 0 + } + , D.color colourTheme.textDarkGrey + ] + none + ] + + mobileNavbar : Element msg mobileNavbar = column @@ -242,44 +289,6 @@ mobileNavbar = , scrollbarY ] [ column - [ centerX - , E.width <| px mobileBarWidth - ] - [ row - (nonHighlightedTitleFormat - ++ [ centerX - ] - ) - [ E.image - [ spacing 2 - , E.width <| px 35 - , centerX - , paddingEach - { top = 10 - , right = 0 - , bottom = 10 - , left = 0 - } - ] - { src = "assets/logo_lambda.png" - , description = "" - } - ] - , el - [ E.width <| px 20 - , alignTop - , centerX - , D.widthEach - { bottom = 1 - , top = 0 - , left = 0 - , right = 0 - } - , D.color colourTheme.textDarkGrey - ] - none - ] - , column [ padding 5 , centerY , centerX @@ -406,62 +415,88 @@ mobilePagesButtonMaker name = desktopFooterIcons : Element msg desktopFooterIcons = - row - [ alignBottom - , E.width fill + column + [ E.width <| px 140 + , alignTop + , centerX + , D.widthEach + { bottom = 0 + , top = 1 + , left = 0 + , right = 0 + } + , D.color colourTheme.textDarkGrey ] [ row - [ centerX - , centerY + [ alignBottom , E.width fill - , E.height fill - , spacing 20 - , paddingEach - { top = 10 - , bottom = 10 - , left = 0 - , right = 0 - } + , centerX ] - -- Use the list of social media details here - (List.map - footerImageMaker - [ gitlabDetails - , twitterDetails - , mastodonDetails - , discordDetails + [ row + [ centerX + , centerY + , E.width fill + , E.height fill + , spacing 20 + , paddingEach + { top = 25 + , bottom = 10 + , left = 0 + , right = 0 + } ] - ) + (List.map + footerImageMaker + [ gitlabDetails + , twitterDetails + , mastodonDetails + , discordDetails + ] + ) + ] ] mobileFooterIcons : Element msg mobileFooterIcons = column - [ alignBottom - , E.width fill + [ E.width <| px 20 + , alignTop + , centerX + , D.widthEach + { bottom = 0 + , top = 1 + , left = 0 + , right = 0 + } + , D.color colourTheme.textDarkGrey ] [ column - [ centerX - , centerY + [ alignBottom , E.width fill - , E.height fill - , spacing 10 - , paddingEach - { top = 10 - , bottom = 10 - , left = 0 - , right = 0 - } ] - (List.map - footerImageMaker - [ gitlabDetails - , twitterDetails - , mastodonDetails - , discordDetails + [ column + [ centerX + , centerY + , E.width fill + , E.height fill + , spacing 10 + , paddingEach + { top = 10 + , bottom = 10 + , left = 0 + , right = 0 + } ] - ) + (List.map + footerImageMaker + [ gitlabDetails + , twitterDetails + , mastodonDetails + , discordDetails + ] + ) + ] ] diff --git a/frontend/static/navbar/contact-dark.png b/frontend/static/navbar/contact-dark.png old mode 100755 new mode 100644 index 47b3b2b..d3d15fe Binary files a/frontend/static/navbar/contact-dark.png and b/frontend/static/navbar/contact-dark.png differ diff --git a/frontend/static/navbar/contact.png b/frontend/static/navbar/contact.png old mode 100755 new mode 100644 index 15c013e..e24e881 Binary files a/frontend/static/navbar/contact.png and b/frontend/static/navbar/contact.png differ diff --git a/frontend/static/navbar/debate-dark.png b/frontend/static/navbar/debate-dark.png index c340ff9..b263626 100644 Binary files a/frontend/static/navbar/debate-dark.png and b/frontend/static/navbar/debate-dark.png differ diff --git a/frontend/static/navbar/debate.png b/frontend/static/navbar/debate.png index 625a184..21b2af6 100644 Binary files a/frontend/static/navbar/debate.png and b/frontend/static/navbar/debate.png differ diff --git a/frontend/static/navbar/donate-dark.png b/frontend/static/navbar/donate-dark.png old mode 100755 new mode 100644 index d88c551..7f39a1b Binary files a/frontend/static/navbar/donate-dark.png and b/frontend/static/navbar/donate-dark.png differ diff --git a/frontend/static/navbar/donate.png b/frontend/static/navbar/donate.png old mode 100755 new mode 100644 index e22298e..773611a Binary files a/frontend/static/navbar/donate.png and b/frontend/static/navbar/donate.png differ diff --git a/frontend/static/navbar/home-dark.png b/frontend/static/navbar/home-dark.png old mode 100755 new mode 100644 index 5109f99..8320dae Binary files a/frontend/static/navbar/home-dark.png and b/frontend/static/navbar/home-dark.png differ diff --git a/frontend/static/navbar/home.png b/frontend/static/navbar/home.png old mode 100755 new mode 100644 index 6a9162d..8568836 Binary files a/frontend/static/navbar/home.png and b/frontend/static/navbar/home.png differ diff --git a/frontend/static/navbar/hyperblog-dark.png b/frontend/static/navbar/hyperblog-dark.png old mode 100755 new mode 100644 index 683a333..869ab68 Binary files a/frontend/static/navbar/hyperblog-dark.png and b/frontend/static/navbar/hyperblog-dark.png differ diff --git a/frontend/static/navbar/hyperblog.png b/frontend/static/navbar/hyperblog.png old mode 100755 new mode 100644 index 707bb0e..14bcbc2 Binary files a/frontend/static/navbar/hyperblog.png and b/frontend/static/navbar/hyperblog.png differ diff --git a/frontend/static/navbar/interviews-dark.png b/frontend/static/navbar/interviews-dark.png old mode 100755 new mode 100644 index 2074943..5c20202 Binary files a/frontend/static/navbar/interviews-dark.png and b/frontend/static/navbar/interviews-dark.png differ diff --git a/frontend/static/navbar/interviews.png b/frontend/static/navbar/interviews.png old mode 100755 new mode 100644 index 8f0841c..6f2cbfe Binary files a/frontend/static/navbar/interviews.png and b/frontend/static/navbar/interviews.png differ diff --git a/frontend/static/navbar/services-dark.png b/frontend/static/navbar/services-dark.png old mode 100755 new mode 100644 index 24f8692..8260f27 Binary files a/frontend/static/navbar/services-dark.png and b/frontend/static/navbar/services-dark.png differ diff --git a/frontend/static/navbar/services.png b/frontend/static/navbar/services.png old mode 100755 new mode 100644 index dcd78e7..f8d8a4a Binary files a/frontend/static/navbar/services.png and b/frontend/static/navbar/services.png differ