Merge branch 'master' into remove-cdn

pacollins · Aug 24, 2019 · 6449077 · 6449077
2 parents 09155a6 + c461bb2
commit 6449077
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ on the Hugo Theme Showcase.
 	- [Non-Development](#non-development)
 	- [Development](#development)
 	- [exampleSite](#examplesite)
+	- [Staticman](#staticman)
 	- [config.toml](#configtoml)
 	- [Hugo's Built-In Server](#hugos-built-in-server)
 - [Shortcodes](#shortcodes)
@@ -129,8 +130,12 @@ exampleSite
 To get started, you will want to copy _config.toml_ from _exampleSite_ to the
 root directory of your project.
 
-If you would like static comments hosted by [Staticman](https://staticman.net/),
-you will also need to copy _staticman.yml_.
+### Staticman
+
+If you would like static comments powered by [Staticman](https://staticman.net/),
+you will also need to copy _staticman.yml_.  You may refer to
+[this project page's Wiki page](https://github.com/pacollins/hugo-future-imperfect-slim/wiki/Staticman-config)
+for details.
 
 ### config.toml
 

diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -1210,7 +1210,7 @@ textarea {
    .flyout-menu {
      background-color: #fff;
      border-left: 1px solid rgba(160, 160, 160, 0.3);
-     height: calc(100vh - 3.5em);
+     height: 100%;
      margin-top: 3.5em;
      padding: 0;
      position: fixed;
@@ -1243,12 +1243,8 @@ textarea {
    display: flex;
    justify-content: space-between;
    .flyout-menu {
-     right: -183px;
-     width: 183px;
-     @include for-laptop-up {
-       right: -183px;
-       width: 183px;
-     }
+     right: -177px;
+     width: 177px;
      @include for-desktop-up {
        background-color: unset;
        border: none;
@@ -1359,7 +1355,6 @@ textarea {
      }
    }
    .lang-toggle {
-     width: 61px;
      &:hover {
        span {
          box-shadow: inset 0 0 0 100px rgba(46, 187, 170, .5);
@@ -1390,11 +1385,16 @@ textarea {
 
  #lang-menu {
    &.flyout-menu {
-     right: -61px;
-     width: 61px;
+     right: -177px;
+     width: 177px;
      a {
        border-left: 0;
      }
+     ul {
+      list-style-type: none;
+      padding: 0;
+      margin: 0;
+     }
      span {
        display: inline-block;
        font-size: 1.75em;
@@ -1408,6 +1408,10 @@ textarea {
          box-shadow: inset 0 0 0 100px rgba(46, 187, 170, .5);
        }
      }
+     .link {
+       border-bottom: dotted 1px rgba(160, 160, 160, 0.3);
+       display: block;
+      }
      .no-lang {
        cursor: not-allowed;
        opacity: .25;
@@ -1429,8 +1433,8 @@ textarea {
      justify-content: flex-start;
    }
    &.flyout-menu {
-     width: 183px;
-     right: -183px;
+     width: 177px;
+     right: -177px;
      padding: 1em;
      h1, a {
        margin: 0 .25em;

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -141,12 +141,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. "
@@ -183,7 +183,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."
@@ -220,9 +220,9 @@ disableLanguages        = [""]
       weight            = 6
 
   [Languages.pl]
-    languageCode        = "pl"
-    LanguageName        = "Polskie"
-    title               = "Hugo przyszłość niedoskonała"
+    LanguageCode        = "pl"
+    LanguageName        = "Polski"
+    title               = "Hugo Future Imperfect Slim po polsku"
     description         = "Motyw HTML5 UP, przeniesiony przez Julio Pescadora i wzbogacony przez Patricka Collinsa. Wielojęzyczny przez StatnMap. Zasilany przez Hugo."
     weight              = 2
 
@@ -257,7 +257,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/...pleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.content b/...pleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.content
diff --git a/exampleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.json b/exampleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.json
@@ -1 +1 @@
-{"Target":"css/bundle.min.a09645c30abf36fe3e508c6f5bb8d8c5d3ff326e58ac0f7077d62c6df63a8788.css","MediaType":"text/css","Data":{"Integrity":"sha256-oJZFwwq/Nv4+UIxvW7jYxdP/Mm5YrA9wd9YsbfY6h4g="}}
+{"Target":"css/bundle.min.8f42b973ebb3d7f01e0ccb9dec3c3cd80760fff2c2ee076b3cc49281740b3c93.css","MediaType":"text/css","Data":{"Integrity":"sha256-j0K5c+uz1/AeDMud7Dw82Adg//LC7gdrPMSSgXQLPJM="}}
diff --git a/...leSite/resources/_gen/assets/scss/scss/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/...leSite/resources/_gen/assets/scss/scss/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
@@ -934,7 +934,7 @@ table {
   #site-header .flyout-menu {
     background-color: #fff;
     border-left: 1px solid rgba(160, 160, 160, 0.3);
-    height: calc(100vh - 3.5em);
+    height: 100%;
     margin-top: 3.5em;
     padding: 0;
     position: fixed;
@@ -962,12 +962,8 @@ table {
   display: flex;
   justify-content: space-between; }
   #site-nav .flyout-menu {
-    right: -183px;
-    width: 183px; }
-    @media (min-width: 768px) {
-      #site-nav .flyout-menu {
-        right: -183px;
-        width: 183px; } }
+    right: -177px;
+    width: 177px; }
     @media (min-width: 1024px) {
       #site-nav .flyout-menu {
         background-color: unset;
@@ -1060,19 +1056,17 @@ table {
         width: 61px; }
         #site-nav > .share-toggle i, #site-nav > .search-toggle i {
           vertical-align: middle; } }
-  #site-nav .lang-toggle {
-    width: 61px; }
-    #site-nav .lang-toggle:hover span {
-      box-shadow: inset 0 0 0 100px rgba(46, 187, 170, 0.5); }
-    #site-nav .lang-toggle span {
-      display: inline-block;
-      font-size: 1.75em;
-      -webkit-transition: box-shadow 0.2s ease;
-      -moz-transition: box-shadow 0.2s ease;
-      -ms-transition: box-shadow 0.2s ease;
-      -o-transition: box-shadow 0.2s ease;
-      transition: box-shadow 0.2s ease;
-      vertical-align: middle; }
+  #site-nav .lang-toggle:hover span {
+    box-shadow: inset 0 0 0 100px rgba(46, 187, 170, 0.5); }
+  #site-nav .lang-toggle span {
+    display: inline-block;
+    font-size: 1.75em;
+    -webkit-transition: box-shadow 0.2s ease;
+    -moz-transition: box-shadow 0.2s ease;
+    -ms-transition: box-shadow 0.2s ease;
+    -o-transition: box-shadow 0.2s ease;
+    transition: box-shadow 0.2s ease;
+    vertical-align: middle; }
   #site-nav .nav-toggle {
     text-align: center;
     width: 61px; }
@@ -1083,10 +1077,14 @@ table {
       vertical-align: middle; }
 
 #lang-menu.flyout-menu {
-  right: -61px;
-  width: 61px; }
+  right: -177px;
+  width: 177px; }
   #lang-menu.flyout-menu a {
     border-left: 0; }
+  #lang-menu.flyout-menu ul {
+    list-style-type: none;
+    padding: 0;
+    margin: 0; }
   #lang-menu.flyout-menu span {
     display: inline-block;
     font-size: 1.75em;
@@ -1098,6 +1096,9 @@ table {
     vertical-align: middle; }
     #lang-menu.flyout-menu span:hover {
       box-shadow: inset 0 0 0 100px rgba(46, 187, 170, 0.5); }
+  #lang-menu.flyout-menu .link {
+    border-bottom: dotted 1px rgba(160, 160, 160, 0.3);
+    display: block; }
   #lang-menu.flyout-menu .no-lang {
     cursor: not-allowed;
     opacity: .25; }
@@ -1113,8 +1114,8 @@ table {
     #share-menu {
       justify-content: flex-start; } }
   #share-menu.flyout-menu {
-    width: 183px;
-    right: -183px;
+    width: 177px;
+    right: -177px;
     padding: 1em; }
     #share-menu.flyout-menu h1, #share-menu.flyout-menu a {
       margin: 0 .25em; }

diff --git a/layouts/partials/language-menu.html b/layouts/partials/language-menu.html
@@ -1,13 +1,13 @@
 <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>
+  <a href="#" lang="{{ .Site.Language.Lang }}" class="link active">{{ .Site.Language.LanguageName }} ({{ .Site.Language.Lang }})</a>
   {{ if .IsTranslated -}}
     {{ range .Translations }}
-        <a href="{{ .Permalink }}" lang="{{ .Lang }}"><span class="flag-icon flag-icon-{{ .Lang }}" alt="{{ .Lang }}"></span></a>
+      <a href="{{ .Permalink }}" lang="{{ .Lang }}" class="link">{{ .Language.LanguageName }} ({{ .Site.Language.Lang }})</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>
+        <a href="{{ relURL .Lang }}" lang="{{ .Lang }}" class="no-lang link">{{ .LanguageName }} ({{ .Lang }})</a>
       {{ end }}
     {{ end }}
   {{ end }}

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.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>