Merge branch 'master' into followable

2017-07-11 11:30:49 +02:00
parent b0ee52556c 6285ad3b68
commit 204ea13c85
85 changed files with 1251 additions and 664 deletions
--- a/app/assets/stylesheets/annotator_overrides.scss
+++ b/app/assets/stylesheets/annotator_overrides.scss
@@ -132,7 +132,7 @@
    background: hsla(51, 91, 75, 0.5);

    .weight-4 {
-     background: hsla(51, 91, 75, 0.75);
+      background: hsla(51, 91, 75, 0.75);
    }
  }

--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -236,6 +236,11 @@ a {
      border-bottom: 2px solid $brand;
      color: $brand;
    }
+
+    &.bold {
+      font-weight: bold;
+      color: $brand;
+    }
  }

  &.no-margin-top {