Merge branch 'lsp-async-init'

3 files changed, 64 insertions, 74 deletions

diff --git a/book/theme/css/general.css b/book/theme/css/general.css
index 7749bded..ddc2387a 100644
--- a/book/theme/css/general.css
+++ b/book/theme/css/general.css
@@ -114,6 +114,19 @@ h6:target::before {
     margin-bottom: .875em;
 }
 
+.content ul li {
+margin-bottom: .25rem;
+}
+.content ul {
+    list-style-type: square;
+}
+.content ul ul, .content ol ul {
+    margin-bottom: .5rem;
+}
+.content li p {
+    margin-bottom: .5em;
+}
+
 .content p { line-height: 1.45em; }
 .content ol { line-height: 1.45em; }
 .content ul { line-height: 1.45em; }
diff --git a/book/theme/css/variables.css b/book/theme/css/variables.css
index a49d6794..db1a11b8 100644
--- a/book/theme/css/variables.css
+++ b/book/theme/css/variables.css
@@ -69,7 +69,7 @@
 
     --links: #2b79a2;
 
-    --inline-code-color: #c5c8c6;;
+    --inline-code-color: #c5c8c6;
 
     --theme-popup-bg: #141617;
     --theme-popup-border: #43484d;
@@ -110,7 +110,7 @@
 
     --links: #20609f;
 
-    --inline-code-color: #301900;
+    --inline-code-color: #a39e9b;
 
     --theme-popup-bg: #fafafa;
     --theme-popup-border: #cccccc;
@@ -151,7 +151,7 @@
 
     --links: #2b79a2;
 
-    --inline-code-color: #c5c8c6;;
+    --inline-code-color: #c5c8c6;
 
     --theme-popup-bg: #161923;
     --theme-popup-border: #737480;
@@ -192,7 +192,7 @@
 
     --links: #2b79a2;
 
-    --inline-code-color: #6e6b5e;
+    --inline-code-color: #c5c8c6;
 
     --theme-popup-bg: #e1e1db;
     --theme-popup-border: #b38f6b;
@@ -234,7 +234,7 @@
 
         --links: #2b79a2;
 
-        --inline-code-color: #c5c8c6;;
+        --inline-code-color: #6e6b5e;
 
         --theme-popup-bg: #141617;
         --theme-popup-border: #43484d;
@@ -261,6 +261,7 @@
 .colibri {
     --bg: #3b224c;
     --fg: #bcbdd0;
+    --heading-fg: #fff;
 
     --sidebar-bg: #281733;
     --sidebar-fg: #c8c9db;
@@ -276,18 +277,19 @@
     /* --links: #a4a0e8; */
     --links: #ECCDBA;
 
-    --inline-code-color: #c5c8c6;;
+    --inline-code-color: hsl(48.7, 7.8%, 70%);
 
     --theme-popup-bg: #161923;
     --theme-popup-border: #737480;
     --theme-hover: rgba(0,0,0, .2);
 
-    --quote-bg: hsl(226, 15%, 17%);
+    --quote-bg: #281733;
     --quote-border: hsl(226, 15%, 22%);
 
-    --table-border-color: hsl(226, 23%, 16%);
-    --table-header-bg: hsl(226, 23%, 31%);
+    --table-border-color: hsl(226, 23%, 76%);
+    --table-header-bg: hsla(226, 23%, 31%, 0);
     --table-alternate-bg: hsl(226, 23%, 14%);
+    --table-border-line: hsla(201deg, 20%, 92%, 0.2);
 
     --searchbar-border-color: #aaa;
     --searchbar-bg: #aeaec6;
@@ -300,6 +302,7 @@
 }
 
 .colibri {
+/*
     --bg: #ffffff;
     --fg: #452859;
     --fg: #5a5977;
@@ -318,7 +321,7 @@
 
     --links: #6F44F0;
 
-    --inline-code-color: #697C81;
+    --inline-code-color: #a39e9b;
 
     --theme-popup-bg: #161923;
     --theme-popup-border: #737480;
@@ -341,4 +344,5 @@
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
     --search-mark-bg: #a2cff5;
+*/
 }
diff --git a/book/theme/highlight.css b/book/theme/highlight.css
index c2343227..8dce7d65 100644
--- a/book/theme/highlight.css
+++ b/book/theme/highlight.css
@@ -1,83 +1,56 @@
-/*
- * An increased contrast highlighting scheme loosely based on the
- * "Base16 Atelier Dune Light" theme by Bram de Haan
- * (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)
- * Original Base16 color scheme by Chris Kempson
- * (https://github.com/chriskempson/base16)
- */
-
-/* Comment */
+pre code.hljs {
+ display:block;
+ overflow-x:auto;
+ padding:1em
+}
+code.hljs {
+ padding:3px 5px
+}
+.hljs {
+ background:#2f1e2e;
+ color:#a39e9b
+}
 .hljs-comment,
 .hljs-quote {
-  color: #575757;
+ color:#8d8687
 }
-
-/* Red */
-.hljs-variable,
-.hljs-template-variable,
-.hljs-attribute,
-.hljs-tag,
-.hljs-name,
-.hljs-regexp,
 .hljs-link,
+.hljs-meta,
 .hljs-name,
+.hljs-regexp,
+.hljs-selector-class,
 .hljs-selector-id,
-.hljs-selector-class {
-  color: #d70025;
+.hljs-tag,
+.hljs-template-variable,
+.hljs-variable {
+ color:#ef6155
 }
-
-/* Orange */
-.hljs-number,
-.hljs-meta,
 .hljs-built_in,
-.hljs-builtin-name,
+.hljs-deletion,
 .hljs-literal,
-.hljs-type,
-.hljs-params {
-  color: #b21e00;
+.hljs-number,
+.hljs-params,
+.hljs-type {
+ color:#f99b15
 }
-
-/* Green */
-.hljs-string,
-.hljs-symbol,
-.hljs-bullet {
-  color: #008200;
+.hljs-attribute,
+.hljs-section,
+.hljs-title {
+ color:#fec418
 }
-
-/* Blue */
-.hljs-title,
-.hljs-section {
-  color: #0030f2;
+.hljs-addition,
+.hljs-bullet,
+.hljs-string,
+.hljs-symbol {
+ color:#48b685
 }
-
-/* Purple */
 .hljs-keyword,
 .hljs-selector-tag {
-  color: #9d00ec;
-}
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  background: #f6f7f6;
-  color: #000;
-  padding: 0.5em;
+ color:#815ba4
 }
-
 .hljs-emphasis {
-  font-style: italic;
+ font-style:italic
 }
-
 .hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-addition {
-  color: #22863a;
-  background-color: #f0fff4;
-}
-
-.hljs-deletion {
-  color: #b31d28;
-  background-color: #ffeef0;
+ font-weight:700
 }