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

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index 4cd440a11..a74a81647 100644
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -1,12 +1,12 @@
 /*
-* Header Styles
-*/
+ * Header Styles
+ */
 
 h1 {
-  font-size: 3.625em;
+  font-size: 3.425em;
   line-height: 1.22222222em;
   margin-top: 0.48888889em;
-  margin-bottom: 0.24444444em;
+  margin-bottom: 0.48888889em;
 }
 h2 {
   font-size: 2.8275em;
@@ -15,44 +15,74 @@ 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: 1.375em;
-  margin-bottom: 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 {
+ * Link styling
+ */
+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%);
   }
+  i {
+    padding-right: $-s;
+  }
+  i.zmdi-hc-flip-horizontal {
+    padding-right: 0;
+    padding-left: $-s;
+  }
+  &.icon {
+    display: inline-block;
+  }
+  svg {
+    position: relative;
+    display: inline-block;
+  }
 }
 
 /*
-* Other HTML Text Elements
-*/
+ * Other HTML Text Elements
+ */
 p, ul, ol, pre, table, blockquote {
   margin-top: 0.3em;
   margin-bottom: 1.375em;
@@ -61,13 +91,12 @@ p, ul, ol, pre, table, blockquote {
 hr {
   border: 0;
   height: 1px;
-  border: 0;
-  background: #e3e0e0;
+  background: #EAEAEA;
   margin-bottom: $-l;
   &.faded {
     background-image: linear-gradient(to right, #FFF, #e3e0e0 20%, #e3e0e0 80%, #FFF);
   }
-  &.margin-top {
+  &.margin-top, &.even {
     margin-top: $-l;
   }
 }
@@ -86,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 {
@@ -93,9 +125,22 @@ 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: $-s;
+  overflow-x: scroll;
 }
 
 blockquote {
@@ -118,14 +163,15 @@ blockquote {
 .code-base {
     background-color: #F8F8F8;
     font-family: monospace;
-    font-size: 0.88em;
+    font-size: 0.80em;
     border: 1px solid #DDD;
     border-radius: 3px;
 }
 
 code {
   @extend .code-base;
-  display: block;
+  display: inline;
+  padding: 1px 3px;
   white-space:pre;
   line-height: 1.2em;
   margin-bottom: 1.2em;
@@ -135,32 +181,117 @@ span.code {
   @extend .code-base;
   padding: 1px $-xs;
 }
+
+pre code {
+  background-color: transparent;
+  border: 0;
+  font-size: 1em;
+  display: block;
+}
 /*
-* Text colors
-*/
+ * Text colors
+ */
 p.pos, p .pos, span.pos, .text-pos {
-	color: $positive;
+  color: $positive;
+  &:hover {
+    color: $positive;
+  }
 }
 
 p.neg, p .neg, span.neg, .text-neg {
-	color: $negative;
+  color: $negative;
+  &:hover {
+    color: $negative;
+  }
 }
 
 p.muted, p .muted, span.muted, .text-muted {
 	color: lighten($text-dark, 26%);
+    &.small, .small {
+      color: lighten($text-dark, 32%);
+    }
 }
 
 p.primary, p .primary, span.primary, .text-primary {
 	color: $primary;
+  &:hover {
+    color: $primary;
+  }
 }
 
 p.secondary, p .secondary, span.secondary, .text-secondary {
 	color: $secondary;
+  &:hover {
+    color: $secondary;
+  }
+}
+
+.text-book {
+  color: $color-book;
+  &:hover {
+    color: $color-book;
+  }
+}
+.text-page {
+  color: $color-page;
+  &:hover {
+    color: $color-page;
+  }
+  &.draft {
+    color: $color-page-draft;
+  }
+  &.draft:hover {
+    color: $color-page-draft;
+  }
+}
+.text-chapter {
+  color: $color-chapter;
+  &:hover {
+    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;
+}
+
+/*
+ * Lists
+ */
+ul {
+  padding-left: $-m * 1.3;
+  list-style: disc;
+  overflow: hidden;
+}
+
+ol {
+  list-style: decimal;
+  padding-left: $-m * 2;
+  overflow: hidden;
+}
+
+li.checkbox-item {
+  list-style: none;
+  margin-left: - ($-m * 1.3);
+  input[type="checkbox"] {
+    margin-right: $-xs;
+  }
 }
 
 /*
-* Generic text styling classes
-*/
+ * Generic text styling classes
+ */
 .underlined {
   text-decoration: underline;
 }
@@ -176,3 +307,48 @@ p.secondary, p .secondary, span.secondary, .text-secondary {
 .text-right {
   text-align: right;
 }
+
+.text-bigger {
+  font-size: 1.1em;
+}
+
+.text-large {
+  font-size: 1.6666em;
+}
+
+.no-color {
+  color: inherit;
+}
+
+/**
+ * Grouping
+ */
+.header-group {
+  margin: $-m 0;
+  h1, h2, h3, h4, h5, h6 {
+    margin: 0;
+  }
+}
+
+span.sep {
+  color: #BBB;
+  padding: 0 $-xs;
+}
+
+.list > * {
+  display: block;
+}
+
+.action-header {
+  h1 {
+    margin-top: $-m;
+  }
+}
+
+/**
+  * Icons
+  */
+i {
+  padding-right: $-xs;
+}
+