🎨 Merge branch 'develop'

assets/css/_common/outline/footer/index.scss

@@ -20,6 +20,18 @@
   text-align: center;
   @include flex-column();
   @include main-container();
+
+  @if $footer_vendors_enable {
+    .vendors-list {
+      a {
+        margin-right: 5px;
+      }
+
+      img {
+        display: inline-block;
+      }
+    }
+  }
 }
 
 .use-motion {
@@ -66,16 +78,13 @@
 }
 
 .with-love {
-  color: $cfg_footer_icon_color;
   display: inline-block;
   margin: 0 5px;
 
-  @if $cfg_footer_icon_animated {
     animation: icon-animate 1.33s ease-in-out infinite;
   }
 }
 
-@if $cfg_footer_beian_enable {
   .beian img {
     display: inline-block;
     margin: 0 3px;
@@ -83,15 +92,12 @@
   }
 }
 
-@if $cfg_busuanzi_enable {
   .busuanzi-count {
-    @if $cfg_busuanzi_visitors {
       #busuanzi_container_site_uv {
         display: none;
       }
     }
 
-    @if $cfg_busuanzi_views {
       #busuanzi_container_site_pv {
         display: none;
       }

assets/css/_common/outline/header/bookmark.scss

@@ -1,17 +1,26 @@
-@if $cfg_bookmark_enable {
+@if $bookmark_enable {
   .book-mark-link {
     border-bottom: 0;
     position: fixed;
     top: -10px;
+
     transition: top .3s;
-    @include sidebar-toggle-position(true);
+    -moz-transition:top .3s;
+    -webkit-transition:top .3s;
+    -o-transition:top .3s;
+
+    @if not $github_banner_enable {
+      @include sidebar-toggle-position(true);
+    } @else {
+      left: 30px;
+    }    
 
     @include tablet-mobile() {
       display: none;
     }
 
     &::before {
-      color: convert($cfg_bookmark_color);
+      color: $bookmark_color;
       font-size: 32px;
       line-height: 1;
       @include font-family-icons('\f02e');

assets/css/_common/outline/header/github-banner.scss

@@ -1,4 +1,4 @@
-@if $cfg_github_banner_enable {
+@if $github_banner_enable {
   @keyframes octocat-wave {
     0%, 100% {
       transform: rotate(0);
@@ -28,7 +28,7 @@
     }
 
     @include tablet-mobile() {
-      @if $cfg_local_search_enable or $cfg_algolia_search_enable {
+      @if $local_search_enable or $algolia_search_enable {
         display: none;
       }
 

assets/css/_common/outline/mobile.scss

@@ -5,7 +5,7 @@
 }
 */
 
-@if $cfg_mobile_layout_economy {
+@if $mobile_layout_economy {
   @include mobile-small() {
     // For Pisces & Gemini schemes only wider width (remove main blocks in Gemini).
     .main-inner {
@@ -56,7 +56,6 @@
         margin-bottom: 10px !important;
         padding: 10px !important;
 
-        @if $cfg_note_icons {
           &:not(.no-icon) {
             padding-left: 35px !important;
           }

assets/css/_common/outline/sidebar/index.scss

@@ -13,6 +13,9 @@
 }
 
 .cc-license {
+
+  margin-top: 6px;
+  
   .cc-opacity {
     border-bottom: 0;
     opacity: .7;

assets/css/_common/outline/sidebar/sidebar-author-links.scss

@@ -1,9 +1,9 @@
-.links-of-author {
+.links-of-author, .links-of-social {
   a {
     font-size: $font-size-smaller;
   }
 
-  @if not $cfg_social_icons_only {
+  @if not $social_icons_only {
     .fa, .fab, .far, .fas {
       margin-right: 2px;
     }

assets/css/_common/outline/sidebar/sidebar-author.scss

@@ -3,11 +3,11 @@
   max-width: $site-author-image-width;
   padding: 2px;
 
-  @if $cfg_avatar_rounded {
+  @if $avatar_rounded {
     border-radius: 50%;
   }
 
-  @if $cfg_avatar_rotated {
+  @if $avatar_rotated {
     transition: transform 1s ease-out;
 
     &:hover {

assets/css/_common/outline/sidebar/sidebar-toc.scss

@@ -1,14 +1,14 @@
-@if $cfg_toc_enable {
   .post-toc {
     font-size: $font-size-small;
+    padding: 0 8px;
 
-    ol {
+    ul {
       list-style: none;
       margin: 0;
       padding: 0 2px 5px 10px;
       text-align: left;
 
-      > ol {
+      > li {
         padding-left: 0;
       }
 
@@ -22,14 +22,14 @@
       overflow: hidden;
       text-overflow: ellipsis;
 
-      @if not $cfg_toc_wrap {
+      @if not $toc_wrap {
         white-space: nowrap;
       }
     }
 
     .nav {
       .nav-child {
-        display: if($cfg_toc_expand_all, block, none);
+        display: if($toc_expand_all, block, none);
       }
 
       .active > .nav-child {

assets/css/_common/outline/sidebar/sidebar-toggle.scss

@@ -12,10 +12,8 @@
 
 @media (any-hover: hover) {
   body:not(.sidebar-active) .sidebar-toggle:hover {
-    @include toggle-arrow($cfg_sidebar_position);
   }
 }
 
 .sidebar-active .sidebar-toggle {
-  @include toggle-close($cfg_sidebar_position);
 }

assets/css/_common/outline/sidebar/site-state.scss

@@ -1,4 +1,3 @@
-@if $cfg_site_state {
   .site-state {
     @include flex-wrap();
     line-height: 1.4;
@@ -8,6 +7,11 @@
     // Fix issue #103
     // The click area of the link becomes smaller
     padding: 0 15px;
+    border-left: 1px solid #eee;
+
+    &:first-child {
+      border-left: none;
+    }
 
     a {
       border-bottom: 0;
@@ -15,6 +19,8 @@
     }
   }
 
+
+
   .site-state-item-count {
     display: block;
     font-size: $site-state-item-count-font-size;