feat(style): adjust style of header, tags and dynamic-to-top button

pogor-dev · Mar 14, 2020 · 3d9aad3 · 3d9aad3
1 parent d8bfd23
commit 3d9aad3
Show file tree

Hide file tree

Showing 23 changed files with 146 additions and 130 deletions.
diff --git a/assets/css/_core/_base.scss b/assets/css/_core/_base.scss
@@ -65,7 +65,6 @@ b, strong {
 a {
   color: $global-link-color;
   text-decoration: none;
-  transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease;
 
   &:hover {
     color: $global-link-hover-color;
@@ -82,47 +81,48 @@ a {
 
 b, strong {
   font-weight: bold;
+
+  .dark-theme & {
+    color: #ddd;
+  }
 }
 
 #dynamic-to-top {
   display: none;
   overflow: hidden;
   width: auto;
-  z-index: 90;
+  z-index: 100;
   position: fixed;
   bottom: 2rem;
   right: 2rem;
   top: auto;
   left: auto;
-  font-family: sans-serif;
-  font-size: 1rem;
-  color: #fff;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 1rem 1rem;
+  font-size: 1.4rem;
+  line-height: 1.8rem;
+  padding: .6rem .6rem;
+  color: $global-font-secondary-color;
+  background: $header-background-color;
   border: 1px solid $global-border-color;
-  background: #222;
-  outline: none;
-  &:hover {
-    background: #000;
+  border-radius: 2rem;
+
+  &:hover, &:active {
+    color: $global-font-color;
+    background: $global-background-color;
     cursor: pointer;
   }
-  &:active {
-    background: #000;
-    outline: none;
-  }
-  &:focus, &:hover {
+
+  &:active, &:focus, &:hover {
     outline: none;
   }
-  span {
-    display: block;
-    overflow: hidden;
-    width: .875rem;
-    height: .75rem;
-    background: url('data:image/png;base64,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') no-repeat center center;
-  }
 
-  .dark-theme &{
-    border: 1px solid $global-border-color-dark;
+  .dark-theme & {
+    color: $global-font-secondary-color-dark;
+    background: $header-background-color-dark;
+    border-color: $global-border-color-dark;
+
+    &:hover, &:active {
+      color: $global-font-color-dark;
+      background: $global-background-color-dark;
+    }
   }
 }
diff --git a/assets/css/_core/_media.scss b/assets/css/_core/_media.scss
@@ -31,7 +31,7 @@
 @media only screen and (max-width: 960px) {
   #header-desktop {
     .header-wrapper {
-      margin: 0 1rem;
+      padding: 0 1rem;
     }
   }
 
@@ -48,7 +48,7 @@
   }
 }
 
-@media only screen and (max-width: 720px) {
+@media only screen and (max-width: 680px) {
   #header-desktop {
     display: none;
   }

diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss
@@ -22,14 +22,14 @@
       color: $single-link-color;
 
       .dark-theme & {
-        color: $single-link-color-dark;
+        color: $global-link-color-dark;
       }
 
       &:hover {
         color: $single-link-hover-color;
 
         .dark-theme & {
-          color: $single-link-hover-color-dark;
+          color: $global-link-hover-color-dark;
         }
       }
     }
@@ -101,7 +101,6 @@
 
       .dark-theme &:hover {
         color: $single-link-hover-color-dark;
-        font-weight: bold;
       }
     }
 
@@ -179,12 +178,10 @@
         min-width: 20%;
         max-width: 80%;
         display: inline-block;
-        padding: .625rem;
+        padding: .5rem;
         margin: 0 auto;
-        border-bottom: 1px solid #d9d9d9;
         font-size: .875rem;
         color: #969696;
-        line-height: 1.7;
       }
 
       img {

diff --git a/assets/css/_partial/_archive/_tags.scss b/assets/css/_partial/_archive/_tags.scss
@@ -14,7 +14,7 @@
     &:focus,
     &:hover {
       color: $global-link-hover-color;
-      transform: scale(1.1);
+      transform: scale(1.2);
 
       .dark-theme & {
         color: $global-link-hover-color-dark;

diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss
@@ -8,25 +8,21 @@ header {
   }
 
   .header-title {
+    font-size: 1.5rem;
     font-weight: bold;
   }
 
-  .language-select {
-    font-weight: $global-font-weight;
-    border: none;
-    box-shadow: none;
-    background: transparent;
-    background-image: none;
-    -webkit-appearance: none;
-    color: $global-font-color;
-
-    .dark-theme & {
-      color: $global-font-color-dark;
-    }
+  .menu .menu-item {
+    position: relative;
+  }
 
-    &:focus {
-      outline: none;
-    }
+  .language-select {
+    position: absolute;
+    opacity: 0;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
 
     &:hover {
       cursor: pointer;
@@ -47,23 +43,20 @@ header {
   .header-wrapper {
     width: auto;
     text-align: center;
-    margin: 0 4rem;
+    padding: 0 3rem;
     display: flex;
     justify-content: space-between;
 
-    .header-title a {
-      padding: 0 8px;
-      font-size: 1.25rem;
+    .menu {
+      .menu-item {
+        margin: 0 .5rem;
 
-      i {
-        line-height: 2rem;
+        &.theme-switch {
+          margin: 0 .3rem;
+        }
       }
-    }
-
-    .menu a {
-      padding: 0 8px;
 
-      &.active {
+      a.active {
         font-weight: 900;
         color: $header-hover-color;
 
@@ -96,10 +89,6 @@ header {
       padding-left: 1rem;
       box-sizing: border-box;
 
-      .header-title {
-        font-size: 1.25rem;
-      }
-
       .menu-toggle {
         cursor: pointer;
         line-height: 4rem;

diff --git a/assets/css/_partial/_single/_toc.scss b/assets/css/_partial/_single/_toc.scss
@@ -2,12 +2,13 @@
   display: block;
   position: absolute;
   width: 100%;
+  max-width: 1000px;
   margin-left: 1000px;
   padding: 0 .8rem;
   border-left: 1px solid $global-border-color;
   overflow-wrap: break-word;
   box-sizing: border-box;
-  top: if($header-normal-mode-desktop, 7rem, 12rem);
+  top: if($header-normal-mode-desktop, 5rem, 10rem);
 
   .dark-theme & {
     border-left: 1px solid $global-border-color-dark;

diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
@@ -50,8 +50,8 @@ $selection-color-dark: rgba(38, 139, 211, 0.3) !default;
 
 // ========== Header ========== //
 // Height of the header
-$header-height-desktop: 4rem !default;
-$header-height-mobile: 3.8rem !default;
+$header-height-desktop: 3.5rem !default;
+$header-height-mobile: 3.5rem !default;
 
 // Color of the header background
 $header-background-color: #f8f8f8 !default;
@@ -77,11 +77,11 @@ $toc-content-font-size: 0.9rem !default;
 
 // Color of the single link
 $single-link-color: #2d96bd !default;
-$single-link-color-dark: #eee !default;
+$single-link-color-dark: #55bde2 !default;
 
 // Color of the hover single link
 $single-link-hover-color: #ef3982 !default;
-$single-link-hover-color-dark: #2d96bd !default;
+$single-link-hover-color-dark: #bdebfc !default;
 
 // Color of the table background
 $table-background-color: #fff !default;

diff --git a/assets/js/theme.min.js b/assets/js/theme.min.js
diff --git a/assets/js/theme.min.js.map b/assets/js/theme.min.js.map
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -25,7 +25,7 @@ enableEmoji = true
     # language code
     languageCode = "en"
     # website title
-    title = "LoveIt Theme"
+    title = "LoveIt"
     # language name
     languageName = "English"
     # whether to include Chinese/Japanese/Korean
@@ -66,7 +66,7 @@ enableEmoji = true
       [[languages.en.menu.main]]
         identifier = "documentation"
         pre = ""
-        name = "Documentation"
+        name = "Docs"
         url = "/categories/documentation/"
         title = ""
         weight = 4
@@ -77,6 +77,13 @@ enableEmoji = true
         url = "/about/"
         title = ""
         weight = 5
+      [[languages.en.menu.main]]
+        identifier = "github"
+        pre = "<i class='fab fa-github fa-fw'></i>"
+        name = ""
+        url = "https://github.com/dillonzq/LoveIt"
+        title = "GitHub"
+        weight = 6
       [languages.en.params]
         # site description
         description = "About LoveIt Theme"
@@ -242,7 +249,7 @@ enableEmoji = true
     # 网站语言, 仅在这里 CN 大写
     languageCode = "zh-CN"
     # 网站标题
-    title = "LoveIt 主题"
+    title = "LoveIt"
     # 语言名称
     languageName = "简体中文"
     # 是否包括中日韩文字
@@ -260,7 +267,7 @@ enableEmoji = true
       [[languages.zh-cn.menu.main]]
         identifier = "posts"
         pre = ""
-        name = "文章"
+        name = "所有文章"
         url = "/posts/"
         title = ""
         weight = 1
@@ -281,7 +288,7 @@ enableEmoji = true
       [[languages.zh-cn.menu.main]]
         identifier = "documentation"
         pre = ""
-        name = "主题文档"
+        name = "文档"
         url = "/categories/documentation/"
         title = ""
         weight = 4
@@ -292,6 +299,13 @@ enableEmoji = true
         url = "/about/"
         title = ""
         weight = 5
+      [[languages.zh-cn.menu.main]]
+        identifier = "github"
+        pre = "<i class='fab fa-github fa-fw'></i>"
+        name = ""
+        url = "https://github.com/dillonzq/LoveIt"
+        title = "GitHub"
+        weight = 6
     [languages.zh-cn.params]
       # 网站描述
       description = "关于 LoveIt 主题"
@@ -457,7 +471,7 @@ enableEmoji = true
     # language code
     languageCode = "fr"
     # website title
-    title = "LoveIt Thème"
+    title = "LoveIt"
     # language name
     languageName = "Français"
     # whether to include Chinese/Japanese/Korean
@@ -496,7 +510,7 @@ enableEmoji = true
       [[languages.fr.menu.main]]
         identifier = "documentation"
         pre = ""
-        name = "Documentation"
+        name = "Docs"
         url = "/categories/documentation/"
         title = ""
         weight = 4
@@ -507,6 +521,13 @@ enableEmoji = true
         url = "/about/"
         title = ""
         weight = 5
+      [[languages.fr.menu.main]]
+        identifier = "github"
+        pre = "<i class='fab fa-github fa-fw'></i>"
+        name = ""
+        url = "https://github.com/dillonzq/LoveIt"
+        title = "GitHub"
+        weight = 6
       [languages.fr.params]
         # site description
         description = "À propos du thème LoveIt"

diff --git a/exampleSite/content/categories/documentation/_index.en.md b/exampleSite/content/categories/documentation/_index.en.md
@@ -0,0 +1,4 @@
+---
+title: "Documentation"
+slug: "documentation"
+---
diff --git a/exampleSite/content/categories/documentation/_index.fr.md b/exampleSite/content/categories/documentation/_index.fr.md
@@ -0,0 +1,4 @@
+---
+title: "Documentation"
+slug: "documentation"
+---
diff --git a/exampleSite/content/categories/documentation/_index.zh-cn.md b/exampleSite/content/categories/documentation/_index.zh-cn.md
@@ -0,0 +1,4 @@
+---
+title: "文档"
+slug: "documentation"
+---
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -56,7 +56,7 @@
 
         {{- /* Dynamic to top button */ -}}
         <a href="#" class="dynamic-to-top animated faster" id="dynamic-to-top">
-            <span>&nbsp;</span>
+            <i class="fas fa-chevron-up fa-fw"></i>
         </a>
 
         {{- /* Load JavaScript scripts and CSS */ -}}