Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / resources / assets / sass / _text.scss

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index 7015400a9048c15513bdfb5579c9ca64effeb2f6..4eaa492e735e74cd47b99a2f0173236f0d90f577 100644 (file)
--- 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,39 +15,51 @@ h2 {
   margin-bottom: 0.43137255em;
 }
 h3 {
-  font-size: 1.75em;
-  line-height: 1.571428572em;
+  font-size: 2.333em;
+  line-height: 1.221428572em;
   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
  */
-a {
+a, .link {
   color: $primary;
   cursor: pointer;
   text-decoration: none;
   transition: color ease-in-out 80ms;
+  font-family: $text;
+  line-height: 1.6;
   &:hover {
     text-decoration: underline;
     color: darken($primary, 20%);
@@ -59,6 +71,13 @@ a {
     padding-right: 0;
     padding-left: $-s;
   }
+  &.icon {
+    display: inline-block;
+  }
+  svg {
+    position: relative;
+    display: inline-block;
+  }
 }
 
 /*
@@ -72,7 +91,6 @@ p, ul, ol, pre, table, blockquote {
 hr {
   border: 0;
   height: 1px;
-  border: 0;
   background: #EAEAEA;
   margin-bottom: $-l;
   &.faded {
@@ -97,6 +115,9 @@ em, i, .italic {
 small, p.small, span.small, .text-small {
   font-size: 0.8em;
   color: lighten($text-dark, 20%);
+  small, p.small, span.small, .text-small {
+    font-size: 1em;
+  }
 }
 
 sup, .superscript {
@@ -104,18 +125,19 @@ sup, .superscript {
   font-size: 0.8em;
 }
 
+sub, .subscript {
+  vertical-align: sub;
+  font-size: 0.8em;
+}
+
 pre {
   font-family: monospace;
-  white-space:pre;
-  font-size: 0.8em;
-  overflow: hidden;
-  border-radius: 4px;
-  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;
+  font-size: 12px;
+  background-color: #f5f5f5;
+  border: 1px solid #DDD;
 }
 
+
 blockquote {
   display: block;
   position: relative;
@@ -154,6 +176,13 @@ span.code {
   @extend .code-base;
   padding: 1px $-xs;
 }
+
+pre code {
+  background-color: transparent;
+  border: 0;
+  font-size: 1em;
+  display: block;
+}
 /*
  * Text colors
  */
@@ -174,7 +203,7 @@ p.neg, p .neg, span.neg, .text-neg {
 p.muted, p .muted, span.muted, .text-muted {
        color: lighten($text-dark, 26%);
     &.small, .small {
-      color: lighten($text-dark, 42%);
+      color: lighten($text-dark, 32%);
     }
 }
 
@@ -203,6 +232,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;
@@ -210,19 +245,55 @@ 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, ol {
+  overflow: hidden;
+  p {
+    margin: 0;
+  }
+}
 ul {
+  padding-left: $-m * 1.3;
   list-style: disc;
-  margin-left: $-m*1.5;
+  ul {
+    list-style: circle;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  label {
+    margin: 0;
+  }
+}
+
+ol {
+  list-style: decimal;
+  padding-left: $-m * 2;
+}
+
+li.checkbox-item, li.task-list-item {
+  list-style: none;
+  margin-left: - ($-m * 1.3);
+  input[type="checkbox"] {
+    margin-right: $-xs;
+  }
 }
 
 /*
@@ -244,6 +315,18 @@ ul {
   text-align: right;
 }
 
+.text-bigger {
+  font-size: 1.1em;
+}
+
+.text-large {
+  font-size: 1.6666em;
+}
+
+.no-color {
+  color: inherit;
+}
+
 /**
  * Grouping
  */
@@ -254,13 +337,25 @@ ul {
   }
 }
 
+span.sep {
+  color: #BBB;
+  padding: 0 $-xs;
+}
+
 .list > * {
   display: block;
 }
 
+.action-header {
+  h1 {
+    margin-top: $-m;
+  }
+}
+
 /**
   * Icons
   */
 i {
   padding-right: $-xs;
-}
\ No newline at end of file
+}
+