X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/fe0b122aca89dbad9741a8ec607b20621d009e39..refs/pull/205/head:/resources/assets/sass/_text.scss

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index ec42fe080..fd993b685 100644
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -3,7 +3,7 @@
  */
 
 h1 {
-  font-size: 3.625em;
+  font-size: 3.425em;
   line-height: 1.22222222em;
   margin-top: 0.48888889em;
   margin-bottom: 0.48888889em;
@@ -15,31 +15,41 @@ h2 {
   margin-bottom: 0.43137255em;
 }
 h3 {
-  font-size: 1.75em;
+  font-size: 2.333em;
   line-height: 1.571428572em;
   margin-top: 0.78571429em;
   margin-bottom: 0.43137255em;
 }
 h4 {
-  font-size: 1em;
+  font-size: 1.666em;
   line-height: 1.375em;
   margin-top: 0.78571429em;
   margin-bottom: 0.43137255em;
 }
 
-h1, h2, h3, h4 {
+h1, h2, h3, h4, h5, h6 {
   font-weight: 400;
   position: relative;
   display: block;
   color: #555;
   .subheader {
-    display: block;
     font-size: 0.5em;
     line-height: 1em;
-    color: lighten($text-dark, 16%);
+    color: lighten($text-dark, 32%);
   }
 }
 
+h5 {
+  font-size: 1.4em;
+}
+
+h5, h6 {
+  font-weight: 500;
+  line-height: 1.2em;
+  margin-top: 0.78571429em;
+  margin-bottom: 0.66em;
+}
+
 /*
  * Link styling
  */
@@ -115,7 +125,8 @@ pre {
   box-shadow: 0 1px 2px 0px rgba(10, 10, 10, 0.06);
   border: 1px solid rgba(221, 221, 221, 0.66);
   background-color: #fdf6e3;
-  padding: 0.5em;
+  padding: $-s;
+  overflow-x: scroll;
 }
 
 blockquote {
@@ -156,6 +167,12 @@ span.code {
   @extend .code-base;
   padding: 1px $-xs;
 }
+
+pre code {
+  background-color: transparent;
+  border: 0;
+  font-size: 1em;
+}
 /*
  * Text colors
  */
@@ -205,6 +222,12 @@ p.secondary, p .secondary, span.secondary, .text-secondary {
   &:hover {
     color: $color-page;
   }
+  &.draft {
+    color: $color-page-draft;
+  }
+  &.draft:hover {
+    color: $color-page-draft;
+  }
 }
 .text-chapter {
   color: $color-chapter;
@@ -212,24 +235,35 @@ p.secondary, p .secondary, span.secondary, .text-secondary {
     color: $color-chapter;
   }
 }
+.faded .text-book:hover {
+  color: $color-book !important;
+}
+.faded .text-chapter:hover {
+  color: $color-chapter !important;
+}
+.faded .text-page:hover {
+  color: $color-page !important;
+}
 
 span.highlight {
   //background-color: rgba($primary, 0.2);
   font-weight: bold;
-  //padding: 2px 4px;
+  padding: 2px 4px;
 }
 
 /*
  * Lists
  */
 ul {
-  padding-left: $-m * 1.5;
-  list-style: disc inside;
+  padding-left: $-m * 1.3;
+  list-style: disc;
+  overflow: hidden;
 }
 
 ol {
-  list-style: decimal inside;
-  padding-left: $-m * 1.5;
+  list-style: decimal;
+  padding-left: $-m * 1.3;
+  overflow: hidden;
 }
 
 /*
@@ -282,6 +316,12 @@ span.sep {
   display: block;
 }
 
+.action-header {
+  h1 {
+    margin-top: $-m;
+  }
+}
+
 /**
   * Icons
   */