Просмотр исходного кода

Change Colorscheme Toggle Button to be floating (#466)

* Moved colour scheme toggle and squashed commits (#433)

Co-authored-by: Luiz F. A. de Prá <luizdepra@users.noreply.github.com>

* Fix toggle button code

* Add built CSS files

Co-authored-by: Jian Liew <jianloongliew@gmail.com>
Luiz F. A. de Prá 5 лет назад
Родитель
Сommit
acef79480d

+ 2 - 1
CONTRIBUTORS.md

@@ -82,6 +82,7 @@
 - [Hussaini Zulkifli](https://github.com/hussaini/)
 - [Ellison Leão](https://github.com/ellisonleao)
 - [Lucas de Oliveira](https://github.com/lucas-dOliveira)
+- [Jian Loong Liew](https://github.com/JianLoong)
 - [earnest ma](https://github.com/earnestma)
 - [TMineCola](https://github.com/tminecola)
-- [Arafat Hasan](https://github.com/arafat-hasan)
+- [Arafat Hasan](https://github.com/arafat-hasan)

+ 25 - 0
assets/scss/_float.scss

@@ -0,0 +1,25 @@
+.float-container {
+  bottom: 2rem;
+  right: 2rem;
+  z-index: 100;
+  position: fixed;
+  font-size: 1.6em;
+  a {
+    display: block;
+    color: $alt-fg-color;
+    background-color: $alt-bg-color;
+    font-size: 2.0rem;
+    padding: 0.5rem;
+    border-radius: 0.5rem;
+    opacity: 50%;
+    transition: opacity 0.5s, color 0.5s;
+    &:hover, &:focus {
+      color: $link-color;
+      opacity: 100%;
+      @media only screen and (max-width : 768px) {
+        color: $alt-fg-color;
+        opacity: 50%;
+      }
+    }
+  }
+}

+ 24 - 0
assets/scss/_float_dark.scss

@@ -0,0 +1,24 @@
+@mixin float_dark {
+  .float-container {
+    a {
+      color: $alt-fg-color-dark;
+      background-color: $alt-bg-color-dark;
+      &:hover, &:focus {
+        color: $link-color-dark;
+        @media only screen and (max-width : 768px) {
+          color: $alt-fg-color-dark;
+        }
+      }
+    }
+  }
+}
+
+body.colorscheme-dark {
+  @include float_dark()
+}
+
+ body.colorscheme-auto {
+  @media (prefers-color-scheme: dark) {
+    @include float_dark()
+  }
+}

+ 4 - 0
assets/scss/_navigation.scss

@@ -74,6 +74,10 @@
     margin: 1.7rem 0;
     font-size: 2.4rem;
     line-height: inherit;
+    bottom: 2rem;
+    left: 2rem;
+    z-index: 100;
+    position: fixed;
   }
   #menu-toggle {
     display: none;

+ 1 - 0
assets/scss/coder-dark.scss

@@ -3,3 +3,4 @@
 @import "content_dark";
 @import "navigation_dark";
 @import "footer_dark";
+@import "float_dark";

+ 1 - 0
assets/scss/coder.scss

@@ -4,3 +4,4 @@
 @import "navigation";
 @import "pagination";
 @import "footer";
+@import "float";

+ 1 - 0
layouts/_default/baseof.html

@@ -99,6 +99,7 @@
   <body class="{{ $csClass }}{{ if .Site.Params.rtl }} rtl{{ end }}"
         onload="{{ if .Site.Params.enableTwemoji }} twemoji.parse(document.body); {{ end }}"
   >
+    {{ partial "float" . }}
     <main class="wrapper">
       {{ partial "header.html" . }}
 

+ 7 - 0
layouts/partials/float.html

@@ -0,0 +1,7 @@
+{{ if not .Site.Params.hidecolorschemetoggle }}
+<div class="float-container">
+    <a id="dark-mode-toggle" class="colorscheme-toggle">
+        <i class="fa fa-adjust fa-fw" aria-hidden="true"></i>
+    </a>
+</div>
+{{ end }}

+ 1 - 1
layouts/partials/footer.html

@@ -23,4 +23,4 @@
       {{ end }}
     </section>
   </footer>
-{{ end }}
+{{ end }}

+ 0 - 10
layouts/partials/header.html

@@ -4,11 +4,6 @@
       {{ .Site.Title }}
     </a>
     {{ if or .Site.Menus.main .Site.IsMultiLingual }}
-      {{ if not .Site.Params.hidecolorschemetoggle }}
-        <span id="dark-mode-toggle" class="float-right">
-          <i class="fa fa-adjust fa-fw" aria-hidden="true"></i>
-        </span>
-      {{ end }}
       <input type="checkbox" id="menu-toggle" />
       <label class="menu-button float-right" for="menu-toggle">
         <i class="fa fa-bars fa-fw" aria-hidden="true"></i>
@@ -38,11 +33,6 @@
             {{ end }}
           {{ end }}
         {{ end }}
-        {{ if not .Site.Params.hidecolorschemetoggle }}
-          <li class="navigation-item separator">
-            <span>|</span>
-          </li>
-        {{ end }}
       </ul>
     {{ end }}
   </section>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
resources/_gen/assets/scss/scss/coder-dark.scss_1fcd9040f1144c65015c77e7b93bc5ac.content


+ 1 - 1
resources/_gen/assets/scss/scss/coder-dark.scss_1fcd9040f1144c65015c77e7b93bc5ac.json

@@ -1 +1 @@
-{"Target":"css/coder-dark.min.ba5a9c70b9b1a615a836cc5f491aceda69f2fbda59bc30b873d6d37213b77c7b.css","MediaType":"text/css","Data":{"Integrity":"sha256-ulqccLmxphWoNsxfSRrO2mny+9pZvDC4c9bTchO3fHs="}}
+{"Target":"css/coder-dark.min.126ad3988d46bdae6217a11105b53c9662bca05f39d42d3c0fb366919d334620.css","MediaType":"text/css","Data":{"Integrity":"sha256-EmrTmI1Gva5iF6ERBbU8lmK8oF851C08D7NmkZ0zRiA="}}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.content


+ 1 - 1
resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.json

@@ -1 +1 @@
-{"Target":"css/coder.min.f19a84724525d6c44f67f32a7454077c01059aa7249da07789336656eaf64489.css","MediaType":"text/css","Data":{"Integrity":"sha256-8ZqEckUl1sRPZ/MqdFQHfAEFmqcknaB3iTNmVur2RIk="}}
+{"Target":"css/coder.min.58a9be249af4e3a0844c3877e24a6d4ad96cf35e6bf0764218fa50801b49d7f4.css","MediaType":"text/css","Data":{"Integrity":"sha256-WKm+JJr046CETDh34kptStls815r8HZCGPpQgBtJ1/Q="}}

Некоторые файлы не были показаны из-за большого количества измененных файлов