⚑ → A文

VincentTam · Aug 22, 2019 · 03918b5 · 03918b5
1 parent 8717824
commit 03918b5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 35 deletions.
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -874,19 +874,6 @@ textarea {
    clip-path: ellipse(40% 25% at 50% 50%);
  }
 
- /* Flags */
-
- .flag-icon {
-   border: 0.02px solid black;
- }
-
- .flag-icon-en {
-   background-image: url(../flags/4x3/en.svg);
-   &.flag-icon-squared {
-     background-image: url(../flags/1x1/en.svg);
-   }
- }
-
  /* Share Button */
 
  .share-btn {
@@ -1365,7 +1352,6 @@ textarea {
      }
    }
    .lang-toggle {
-     width: 61px;
      &:hover {
        span {
          box-shadow: inset 0 0 0 100px rgba(46, 187, 170, .5);
@@ -1395,12 +1381,16 @@ textarea {
  }
 
  #lang-menu {
+   right: -300px;
    &.flyout-menu {
-     right: -61px;
-     width: 61px;
      a {
        border-left: 0;
      }
+     ul {
+      list-style-type: none;
+      padding: 0;
+      margin: 0;
+     }
      span {
        display: inline-block;
        font-size: 1.75em;

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -140,12 +140,12 @@ disableLanguages        = [""]
 [Languages]
   # Each language has its own menu.
   [Languages.en]
-    languageCode        = "en"
+    LanguageCode        = "en"
     LanguageName        = "English"
     weight              = 1
 
   [Languages.de]
-    languageCode        = "de"
+    LanguageCode        = "de"
     LanguageName        = "Deutsch"
     title               = "Hugo Future Imperfect Slim auf deutsch"
     description         = "Ein Thema von HTML5 UP, portiert von Julio Pescador.  Vereinfacht und verbessert von Patrick Collins. Mehrsprachig von StatnMap. Unterstützt von: Hugo. "
@@ -182,7 +182,7 @@ disableLanguages        = [""]
       weight            = 6
 
   [Languages.fr]
-    languageCode        = "fr"
+    LanguageCode        = "fr"
     LanguageName        = "Français"
     title               = "Hugo Future Imperfect Slim en français"
     description         = "Un thème par HTML5 UP, porté par Julio Pescador. Simplifié et amélioré par Patrick Collins. Multilingue par StatnMap. Propulsé par Hugo."
@@ -219,8 +219,8 @@ disableLanguages        = [""]
       weight            = 6
 
   [Languages.pl]
-    languageCode        = "pl"
-    LanguageName        = "Polskie"
+    LanguageCode        = "pl"
+    LanguageName        = "Polski"
     title               = "Hugo przyszłość niedoskonała"
     description         = "Motyw HTML5 UP, przeniesiony przez Julio Pescadora i wzbogacony przez Patricka Collinsa. Wielojęzyczny przez StatnMap. Zasilany przez Hugo."
     weight              = 2
@@ -256,7 +256,7 @@ disableLanguages        = [""]
       weight            = 6
 
   [Languages.pt]
-    languageCode        = "pt"
+    LanguageCode        = "pt"
     LanguageName        = "Português"
     title               = "Hugo Future Imperfect Slim em português"
     description         = "Um tema do HTML5 UP, portado por Julio Pescadora e reduzido por Patrick Collins. Multilíngue por StatnMap. Feito com Hugo."

diff --git a/...leSite/resources/_gen/assets/scss/scss/main.scss_b5a97001882d870cddf46d3bce56b70e.content b/...leSite/resources/_gen/assets/scss/scss/main.scss_b5a97001882d870cddf46d3bce56b70e.content
diff --git a/exampleSite/resources/_gen/assets/scss/scss/main.scss_b5a97001882d870cddf46d3bce56b70e.json b/exampleSite/resources/_gen/assets/scss/scss/main.scss_b5a97001882d870cddf46d3bce56b70e.json
@@ -1 +1 @@
-{"Target":"css/main.min.23afd7f8b5afb4794b8283807f9ba0681c4be2c45a9d16cf05ba5ea0d7cce5f6.css","MediaType":"text/css","Data":{"Integrity":"sha256-I6/X+LWvtHlLgoOAf5ugaBxL4sRanRbPBbpeoNfM5fY="}}
+{"Target":"css/main.min.dd05360dd1d3fcdd03e0046d36d949d3f22da7c91aa4745834f56073ae86f87e.css","MediaType":"text/css","Data":{"Integrity":"sha256-3QU2DdHT/N0D4ARtNtlJ0/Itp8kapHRYNPVgc66G+H4="}}
diff --git a/layouts/partials/language-menu.html b/layouts/partials/language-menu.html
@@ -1,14 +1,16 @@
 <menu id="lang-menu" class="flyout-menu">
-  <a href="#" lang="{{ .Site.Language.Lang }}" class="active"><span class="flag-icon flag-icon-{{ .Site.Language.Lang }}" alt="{{ .Site.Language.Lang }}"></span></a>
-  {{ if .IsTranslated -}}
-    {{ range .Translations }}
-        <a href="{{ .Permalink }}" lang="{{ .Lang }}"><span class="flag-icon flag-icon-{{ .Lang }}" alt="{{ .Lang }}"></span></a>
-    {{ end }}
-  {{ else }}
-    {{ range .Site.Languages }}
-      {{ if not (eq .Lang $.Site.Language.Lang) }}
-        <a href="{{ "" | relLangURL }}" lang="{{ .Lang }}" class="no-lang"><span class="flag-icon flag-icon-{{ .Lang }}" alt="{{ .Lang }}"></span></a>
+  <ul>
+    <li><a href="#" lang="{{ .Site.Language.Lang }}" class="active">{{ .Site.Language.LanguageName }} ({{ .Site.Language.Lang }})</a></li>
+    {{ if .IsTranslated -}}
+      {{ range .Translations }}
+        <li><a href="{{ .Permalink }}" lang="{{ .Lang }}">{{ .Language.LanguageName }} ({{ .Site.Language.Lang }})</a></li>
+      {{ end }}
+    {{ else }}
+      {{ range .Site.Languages }}
+        {{ if not (eq .Lang $.Site.Language.Lang) }}
+          <li><a href="{{ relURL .Lang }}" lang="{{ .Lang }}" class="no-lang">{{ .LanguageName }} ({{ .Lang }})</a></li>
+        {{ end }}
       {{ end }}
     {{ end }}
-  {{ end }}
+  </ul>
 </menu>
diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html
@@ -27,7 +27,7 @@ <h1 class="nav-title">
     </menu>
     {{ if .Site.Params.header.searchMenu }}{{ partial "search-menu" . }}{{ end }}
     {{ if .Site.Params.header.shareMenu }}<a href="#share-menu" class="share-toggle"><i class="fas fa-share-alt fa-2x">&nbsp;</i></a>{{ end }}
-    {{ if .Site.Params.header.languageMenu }}<a href="#lang-menu" class="lang-toggle" lang="{{ .Site.Language.Lang }}"><span class="flag-icon flag-icon-{{ .Site.Language.Lang }}" alt="{{ .Site.Language.Lang }}"></span></a>{{ end }}
+    {{ if .Site.Params.header.languageMenu }}<a href="#lang-menu" class="lang-toggle" lang="{{ .Site.Language.Lang }}">{{ .Site.Language.LanguageName }} ({{ .Site.Language.Lang }})</a>{{ end }}
     <a href="#site-nav" class="nav-toggle"><i class="fas fa-bars fa-2x"></i></a>
   </nav>
   {{ if .Site.Params.header.languageMenu }}{{ partial "language-menu" . }}{{ end }}

diff --git a/layouts/partials/site-intro.html b/layouts/partials/site-intro.html
@@ -14,4 +14,5 @@
       </ul>
     </footer>
   {{ end }}
+  <p>{{ .Site.Languages }}</p>
 </section>