Disable selection for highlight meta (#977)

theme-next · Jul 17, 2019 · 183e5b1 · 183e5b1
1 parent a362d70
commit 183e5b1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/source/css/_common/components/highlight/copy-code.styl b/source/css/_common/components/highlight/copy-code.styl
@@ -18,10 +18,11 @@
   white-space: nowrap;
   vertical-align: middle;
   cursor: pointer;
-  user-select: none;
   outline: 0;
   transition: opacity .3s ease-in-out;
   opacity: 0;
+  disable-user-select();
+
   if hexo-config('codeblock.copy_button.style') == 'flat' {
     background-color: #fff;
     border: none;

diff --git a/source/css/_common/components/highlight/highlight.styl b/source/css/_common/components/highlight/highlight.styl
@@ -98,10 +98,7 @@ pre {
 }
 
 .gutter {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+  disable-user-select();
 }
 
 .gist table {
@@ -110,14 +107,24 @@ pre {
   td { border: none; }
 }
 
-// For diff highlight
-pre .deletion { background: $highlight-deletion; }
-pre .addition { background: $highlight-addition; }
-pre .meta     { color: $highlight-purple; }
-
 pre {
+  // For diff highlight
+  .deletion {
+    background: $highlight-deletion;
+  }
+
+  .addition {
+    background: $highlight-addition;
+  }
 
-  .comment { color: $highlight-comment; }
+  .meta {
+    color: $highlight-yellow;
+    disable-user-select();
+  }
+
+  .comment {
+    color: $highlight-comment;
+  }
 
   .variable
   .attribute

diff --git a/source/css/_common/components/sidebar/sidebar-author.styl b/source/css/_common/components/sidebar/sidebar-author.styl
@@ -5,7 +5,7 @@
   max-width: $site-author-image-width;
   height: $site-author-image-height;
   border: $site-author-image-border-width solid $site-author-image-border-color;
-  border-radius: 100% if hexo-config('avatar.rounded');
+  circle() if hexo-config('avatar.rounded');
 }
 
 if hexo-config('avatar.rotated') {

diff --git a/source/css/_mixins/base.styl b/source/css/_mixins/base.styl
@@ -103,3 +103,10 @@ disable-touch-hover() {
     }
   }
 }
+
+disable-user-select() {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}