X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/74b4751a1c110b4c824b14369d3a5eea3ad5816a..refs/pull/5313/head:/resources/sass/_text.scss

diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index 6745d2a54..56e66195c 100644
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -3,10 +3,10 @@
  */
 
 body, button, input, select, label, textarea {
-  font-family: $text;
+  font-family: var(--font-body);
 }
-.Codemirror, pre, #markdown-editor-input, .text-mono, .code-base {
-  font-family: $mono;
+pre, #markdown-editor-input, .text-mono, .code-base {
+  font-family: var(--font-code);
 }
 
 /*
@@ -42,12 +42,8 @@ h1, h2, h3, h4, h5, h6 {
   font-weight: 400;
   position: relative;
   display: block;
+  font-family: var(--font-heading, var(--font-body));
   @include lightDark(color, #222, #BBB);
-  .subheader {
-    font-size: 0.5em;
-    line-height: 1em;
-    color: lighten($text-dark, 32%);
-  }
 }
 
 h5 {
@@ -181,7 +177,7 @@ pre {
   @include lightDark(background-color, #FFF, #2B2B2B);
   @include lightDark(border-color, #DDD, #111);
   border-radius: 4px;
-  padding-left: 26px;
+  padding-inline-start: 26px;
   position: relative;
   padding-top: 3px;
   padding-bottom: 3px;
@@ -191,10 +187,10 @@ pre {
     position: absolute;
     top: 0;
     width: 22.4px;
-    left: 0;
+    inset-inline-start: 0;
     height: 100%;
     @include lightDark(background-color, #f5f5f5, #313335);
-    @include lightDark(border-right, 1px solid #DDD, none);
+    @include lightDark(border-inline-end, 1px solid #DDD, none);
   }
 }
 
@@ -202,7 +198,7 @@ pre {
   pre {
     padding-left: 12px;
   }
-  pre:after {
+  pre:before {
     display: none;
   }
 }
@@ -210,7 +206,8 @@ pre {
 blockquote {
   display: block;
   position: relative;
-  border-left: 4px solid var(--color-primary);
+  border-left: 4px solid transparent;
+  border-left-color: var(--color-primary);
   @include lightDark(background-color, #f8f8f8, #333);
   padding: $-s $-m $-s $-xl;
   overflow: auto;
@@ -221,12 +218,12 @@ blockquote {
     position: absolute;
     top: $-s;
     left: $-s;
-    color: lighten($text-dark, 20%);
+    color: #777;
   }
 }
 
 .text-mono {
-  font-family: $mono;
+  font-family: var(--font-code);
 }
 
 .text-uppercase {
@@ -307,15 +304,26 @@ li > ol, li > ul {
   padding-right: $-m * 1.2;
 }
 
+/**
+ * Checkbox lists
+ * Some styles duplicated for supporting logical units (eg. inline-end) while
+ * providing fallbacks to non-logical rules, so RTL is natively supported where possible.
+ */
 li.checkbox-item, li.task-list-item {
   display: list-item;
   list-style: none;
   margin-left: -($-m * 1.2);
+  margin-inline-start: -($-m * 1.2);
+  margin-inline-end: 0;
   input[type="checkbox"] {
     margin-right: $-xs;
+    margin-inline-end: $-xs;
+    margin-inline-start: 0;
   }
   li.checkbox-item, li.task-list-item {
     margin-left: $-xs;
+    margin-inline-start: $-xs;
+    margin-inline-end: 0;
   }
 }
 
@@ -363,6 +371,7 @@ li.checkbox-item, li.task-list-item {
 }
 
 .break-text {
+  white-space: normal;
   word-wrap: break-word;
   overflow-wrap: break-word;
 }