Responsive navigation updated, multilingual menu fixed, some minor ch…

…nage added
IrynaHaiduk · Jul 6, 2021 · 0162676 · 0162676
1 parent f85105c
commit 0162676
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 64 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Themefisher
+Copyright (c) 2021 Themefisher
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/assets/css/style.css b/assets/css/style.css
@@ -471,6 +471,23 @@ a:focus, a:hover {
  background: #1f2532;
 }
 
+.select-language a {
+ color: #fff;
+ text-transform: uppercase;
+ font-weight: 600;
+ margin-left: 15px;
+}
+
+.select-language a.selected {
+ display: none;
+}
+
+.select-language a img {
+ position: relative;
+ top: -2px;
+ left: -3px;
+}
+
 .top-bar {
  position: sticky;
  top: 0;
@@ -482,26 +499,27 @@ a:focus, a:hover {
  z-index: 10;
 }
 
-.navigation .navbar-nav > li.active a {
+.navigation .navbar-nav > li.active .nav-link {
  color: #fff;
 }
 
-.navigation .navbar-nav > li > a {
- color: #707d8f;
+.navigation .navbar-nav > li > .nav-link {
+ color: #b6b8bb;
  font-size: 15px;
  line-height: 26px;
  padding: 20px 15px !important;
  transition: .2s ease-in-out 0s;
+ text-transform: capitalize;
 }
 
 @media (max-width: 480px) {
- .navigation .navbar-nav > li > a {
+ .navigation .navbar-nav > li > .nav-link {
  padding: 8px 0 !important;
  }
 }
 
-@media (max-width: 768px) {
- .navigation .navbar-nav > li > a {
+@media (max-width: 991px) {
+ .navigation .navbar-nav > li > .nav-link {
  padding: 8px 0 !important;
  }
 }
@@ -1699,7 +1717,8 @@ a:focus, a:hover {
  color: #cccccc;
 }
 .pagination li.active a{
- color: #f0326b;
+ background-color: #f0326b !important;
+ border-color: #f0326b !important;
  font-weight: 600;
 }
 
@@ -1754,23 +1773,22 @@ a:focus, a:hover {
 }
 
 .footer-bottom h5 {
- font-size: 12px;
+ font-size: 14px;
  line-height: 1;
  color: #888888;
  font-weight: 400;
  text-transform: uppercase;
- letter-spacing: 2px;
  margin-top: 7px;
  margin-bottom: 3px;
 }
 
 .footer-bottom h6 {
- font-size: 11px;
+ font-size: 13px;
  line-height: 15px;
  color: #888888;
  font-weight: 400;
  text-transform: capitalize;
- letter-spacing: 2px;
+ letter-spacing: 1px;
  margin-bottom: 0;
 }
 

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -1,4 +1,4 @@
-baseURL = "https://example.org/"
+baseURL = "https://demo.gethugothemes.com/navigator/"
 languageCode = "en-us"
 title = "Navigator | Responsive Multipurpose Bootstrap Hugo Template"
 theme = "navigator-hugo"
@@ -40,7 +40,7 @@ languageCode = "fr-fr"
 title = "FRANCAIS Example site multi-language"
 dateFormat = "2 January 2006"
 
-home = "FR Home"
+home = "Home"
 logo = "images/logo.png"
 menufixed = false
 
@@ -106,7 +106,7 @@ weight = 2
 languageCode = "en-us"
 title = "Example site multi-language"
 dateFormat = "January 2, 2006"
-home = "EN Home"
+home = "Home"
 logo = "images/logo.png"
 menufixed = false
 

diff --git a/exampleSite/i18n/en.toml b/exampleSite/i18n/en.toml
@@ -1,24 +1,24 @@
 [about]
-other = "EN About"
+other = "About"
 [service]
-other = "EN Service"
+other = "Service"
 [portfolio]
-other = "EN Portfolio"
+other = "Portfolio"
 [blog]
-other = "EN Blog"
+other = "Blog"
 [contact]
-other = "EN Contact"
+other = "Contact"
 
 [graphicdesign]
-other = "EN Graphic Design"
+other = "Graphic Design"
 [webdesign]
-other = "EN Web Design"
+other = "Web Design"
 [webdevelopment]
-other = "EN Web Development"
+other = "Web Development"
 
 [partners]
-other = "EN Partners"
+other = "Partners"
 [faqs]
-other = "EN FAQ's"
+other = "FAQ's"
 [badges]
-other = "EN Badges"
+other = "Badges"
diff --git a/exampleSite/i18n/fr.toml b/exampleSite/i18n/fr.toml
@@ -1,24 +1,24 @@
 [about]
-other = "FR About"
+other = "À Propos"
 [service]
-other = "FR Service"
+other = "Un Service"
 [portfolio]
-other = "FR Portfolio"
+other = "Portefeuille"
 [blog]
-other = "FR Blog"
+other = "Blog"
 [contact]
-other = "FR Contact"
+other = "Contacter"
 
 [graphicdesign]
-other = "FR Graphic Design"
+other = "Graphic Design"
 [webdesign]
-other = "FR Web Design"
+other = "Web Design"
 [webdevelopment]
-other = "FR Web Development"
+other = "Web Development"
 
 [partners]
-other = "FR Partners"
+other = "Les Partenaires"
 [faqs]
-other = "FR FAQ's"
+other = "FAQ's"
 [badges]
-other = "FR Badges"
+other = "Insignes"
diff --git a/layouts/partials/cta.html b/layouts/partials/cta.html
@@ -6,7 +6,7 @@
  <div class="col-md-12 text-center">
  {{ with .Site.Params.cta.title }}<h2>{{ . }}</h2>{{ end }}
  {{ with .Site.Params.cta.subtitle }}<p>{{ . | safeHTML }}</p>{{ end }}
- {{ with .Site.Params.cta.btnText }}<a href="{{ "contact" | absURL }}" class="btn btn-main">{{ . }}</a>{{ end }}
+ {{ with .Site.Params.cta.btnText }}<a href="{{ `contact` | absLangURL }}" class="btn btn-main">{{ . }}</a>{{ end }}
  </div>
  </div>
  </div>

diff --git a/layouts/partials/flags.html b/layouts/partials/flags.html
@@ -7,6 +7,6 @@
 {{ if eq (string .liste.code) (string .site.Language) }}
  <a href="{{ .liste.code | absURL }}" class="selected"><img src= {{ $icone_url | absURL }} alt="IMAGE" />{{ .liste.code }}
  {{ else }}
- <a href="{{ .liste.code | absURL }}"><img src= {{ $icone_url | absURL }} alt="IMAGE" />
+ <a href="{{ .liste.code | absURL }}"><img src= {{ $icone_url | absURL }} alt="IMAGE" />{{ .liste.code }}
 {{ end }}
 </a>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -41,9 +41,9 @@ <h3>{{ .Site.Params.footerSubscribeTitle }}</h3>
  </div>
  <div class="footer-bottom">
  <h5>Copyright 2021. All rights reserved.</h5>
- <h6>Design and Developed by themefisher.com
+ <h6>Design and Developed by Themefisher
  <br>Get More
- <a href="https://themefisher.com/free-bootstrap-templates/" target="_blank">Free Bootstrap Templates</a>
+ <a href="https://themefisher.com/hugo-themes/" target="_blank">Themefisher</a>
  </h6>
  </div>
 </footer>

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -7,28 +7,29 @@
  <div class="container">
  <div class="row">
  <div class="col-md-12">
- <nav class="navbar navbar-expand-md">
- <a class="navbar-brand" href="{{ .Site.BaseURL }}">
+ <nav class="navbar navbar-expand-lg">
+ <a class="navbar-brand" href="{{ .Site.BaseURL | relLangURL }}">
  <img src="{{ .Site.Params.logo | absURL }}" alt="{{ .Site.Title }}">
  </a>
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navigation"
- aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation">
- <span class="tf-ion-android-menu"></span>
- </button>
- <!-- Icones & drapeaux de choix des langues -->
- <div id="drapeaux">
- <!-- Pour passer la langue actuelle (variable globale) dans la range => explicitement -->
- {{ range .Site.Params.listeLangues }}
- {{ partial "flags.html" (dict "site" $.Site "liste" .) }}
- {{ end }}
+ <div class="d-flex align-items-center">
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navigation"
+ aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="tf-ion-android-menu"></span>
+ </button>
+ <!-- Icones & drapeaux de choix des langues -->
+ <div id="drapeaux" class="select-language d-block d-lg-none">
+ <!-- Pour passer la langue actuelle (variable globale) dans la range => explicitement -->
+ {{ range .Site.Params.listeLangues }}
+ {{ partial "flags.html" (dict "site" $.Site "liste" .) }}
+ {{ end }}
+ </div>
  </div>
  <div class="collapse navbar-collapse" id="navigation">
  <ul class="navbar-nav ml-auto">
  <li class="nav-item">
- <a class="nav-link"
- href="{{ .Site.BaseURL }}">{{ with .Site.Params.home }}{{ . }}{{ end }}</a>
+ <a class="nav-link" href="{{ .Site.BaseURL }}">{{ with .Site.Params.home }}{{ . }}{{ end }}</a>
  </li>
- {{ range .Site.Menus.nav }}
+ {{ range site.Menus.nav }}
  {{ if .HasChildren }}
  <li class="nav-item dropdown">
  <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown"
@@ -47,6 +48,15 @@
  </li>
  {{ end }}
  {{ end }}
+ <li class="nav-item d-none d-lg-block">
+ <!-- Icones & drapeaux de choix des langues -->
+ <div class="select-language nav-link">
+ <!-- Pour passer la langue actuelle (variable globale) dans la range => explicitement -->
+ {{ range .Site.Params.listeLangues }}
+ {{ partial "flags.html" (dict "site" $.Site "liste" .) }}
+ {{ end }}
+ </div>
+ </li>
  </ul>
  </div>
  </nav>

diff --git a/static/plugins/bootstrap/dist/css/bootstrap.min.css b/static/plugins/bootstrap/dist/css/bootstrap.min.css
diff --git a/static/plugins/bootstrap/dist/js/bootstrap.min.js b/static/plugins/bootstrap/dist/js/bootstrap.min.js
diff --git a/static/plugins/bootstrap/dist/js/popper.min.js b/static/plugins/bootstrap/dist/js/popper.min.js
diff --git a/static/plugins/lightbox2/dist/js/lightbox.min.js b/static/plugins/lightbox2/dist/js/lightbox.min.js