Merge pull request #91 from intelops/chandu

changed header & text colors and pr82
intelops · Apr 19, 2023 · 4ea3c91 · 4ea3c91
2 parents 8c45552 + c337683
commit 4ea3c91
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 10 deletions.
diff --git a/config.toml b/config.toml
@@ -63,3 +63,4 @@ text_color = "#555"
 text_dark = "#222222"
 text_light = "#959595"
 white = "#fff"
+secblack = "#121826"
diff --git a/config/_default/params.toml b/config/_default/params.toml
@@ -8,8 +8,10 @@ email = "[email protected]"
 favicon = "images/favicon/favicon-32x32.png"
 image = "images/logo.png"
 
-logo = "images/logos/logo-light.svg"
+logo = "images/logos/logo-dark.svg"
+logo_light = "images/logos/logo-light.svg"
 logo_dark = "images/logos/logo-dark.svg"
+footer_logo_dark = false
 logo_webp = false
 
 logo_text = "Intelops"

diff --git a/content/english/open-source/contributed-open-source.md b/content/english/open-source/contributed-open-source.md
@@ -8,6 +8,7 @@ draft: false
 navigation:
   logo: "images/dummy-logo.png"
   logo_text: "Capten"
+  logo_text_color: "white"
 
   menu:
   - name: "Test 1"

diff --git a/content/english/open-source/our-open-source.md b/content/english/open-source/our-open-source.md
@@ -8,6 +8,7 @@ draft: false
 navigation:
   logo: "images/dummy-logo.png"
   logo_text: "Capten"
+  logo_text_color: "white"
 
   menu:
   - name: "Test 1"

diff --git a/content/english/platform/capten.md b/content/english/platform/capten.md
@@ -8,6 +8,7 @@ draft: false
 navigation:
   logo: "images/dummy-logo.png"
   logo_text: "Capten"
+  logo_text_color: "secblack"
 
   menu:
   - name: "Test 1"

diff --git a/content/english/platform/compage.md b/content/english/platform/compage.md
@@ -8,6 +8,7 @@ draft: false
 navigation:
   logo: "images/logos/compage/compage-icon.svg"
   logo_text: "Compage"
+  logo_text_color: "secblack"
 
   menu:
   - name: "Test 1"

diff --git a/content/english/platform/opty.md b/content/english/platform/opty.md
@@ -7,7 +7,8 @@ draft: false
 
 navigation:
   logo: "images/dummy-logo.png"
-  logo_text: "Capten"
+  logo_text: "Opty"
+  logo_text_color: "secblack"
 
   menu:
   - name: "Test 1"

diff --git a/themes/delta/assets/scss/_common.scss b/themes/delta/assets/scss/_common.scss
@@ -773,7 +773,7 @@ form label {
 }
 
 .nav-menu-text {
-  color: $white !important;
+  color: $black !important;
 }
 
 .header-sec {

diff --git a/themes/delta/layouts/partials/footer-logo-dark.html b/themes/delta/layouts/partials/footer-logo-dark.html
@@ -27,7 +27,7 @@
 
 <img loading="prelaod" decoding="async" class="img-fluid" {{if ne $logoExt `.svg`}}
   width="{{$logoWidth | default $logo.Width}}" height="{{$logo.Height}}" {{end}} src="{{.Scratch.Get `logo`}}"
-  alt="{{ site.Title }}" onerror="this.onerror=null;this.src='{{.Scratch.Get `logo_fallback`}}'">
+  alt="{{ site.Title }}" style="width:130px" onerror="this.onerror=null;this.src='{{.Scratch.Get `logo_fallback`}}'">
 {{ end }}
 <!-- logo text -->
 {{ else if site.Params.logo_text }}

diff --git a/themes/delta/layouts/partials/footer-logo.html b/themes/delta/layouts/partials/footer-logo.html
@@ -1,4 +1,4 @@
-{{ $logoPath:= site.Params.logo }}
+{{ $logoPath:= site.Params.logo_light }}
 {{ $logoWidth:= replace site.Params.logo "px" "x" }}
 
 <!-- checking logo existance -->
@@ -27,7 +27,7 @@
 
 <img loading="prelaod" decoding="async" class="img-fluid" {{if ne $logoExt `.svg`}}
   width="{{$logoWidth | default $logo.Width}}" height="{{$logo.Height}}" {{end}} src="{{.Scratch.Get `logo`}}"
-  alt="{{ site.Title }}" onerror="this.onerror=null;this.src='{{.Scratch.Get `logo_fallback`}}'">
+  alt="{{ site.Title }}" style="width:130px" onerror="this.onerror=null;this.src='{{.Scratch.Get `logo_fallback`}}'">
 {{ end }}
 <!-- logo text -->
 {{ else if site.Params.logo_text }}

diff --git a/themes/delta/layouts/partials/footer.html b/themes/delta/layouts/partials/footer.html
@@ -26,7 +26,7 @@
     <div class="row align-items-center gy-3">
       <div class="col-lg-4 mx-auto text-center text-lg-start">
         <a class="footer-brand" href="{{ site.BaseURL | relLangURL }}" title="{{site.Title}}">
-          {{if $footer_light}}
+          {{if or $footer_light (eq site.Params.footer_logo_dark true)}}
           {{ partial "footer-logo-dark.html" . }}
           {{else}}
           {{ partial "footer-logo.html" . }}

diff --git a/themes/delta/layouts/partials/header-alt.html b/themes/delta/layouts/partials/header-alt.html
@@ -1,5 +1,5 @@
 <!-- navigation -->
-<header class="navigation dark-bar navigation-bottom">
+<header class="navigation light-bar navigation-bottom">
   <div class="container container-delta">
     <!-- navbar -->
     <nav class="navbar navbar-expand-xl navbar-light" id="main-navbar">
@@ -182,7 +182,7 @@
           <!-- / checking logo path -->
         {{ end }}
       </span>
-      <span class="text-white ms-1 fw-bold">{{$logoText}}</span>
+      <span class="{{if not .Params.navigation.logo_text_color}}text-white{{end}} ms-1 fw-bold" {{with .Params.navigation.logo_text_color}}style="color:{{.}}"{{end}}>{{$logoText}}</span>
 
       <div class="navbar-actions d-inline-flex align-items-center">
         <!-- Language List -->

diff --git a/themes/delta/layouts/partials/header.html b/themes/delta/layouts/partials/header.html
@@ -1,6 +1,6 @@
 <!-- navigation -->
 {{ $headerWhite := or (eq .Section "platform") (eq .Section "open-source") }}
-<header class="navigation dark-bar {{ if $headerWhite }} navigation-alt {{ end }}" id="main-header">
+<header class="navigation light-bar {{ if $headerWhite }} navigation-alt {{ end }}" id="main-header">
   <div class="container container-delta">
     <!-- navbar -->
     <nav class="navbar navbar-expand-xl navbar-light" id="main-navbar">