Merge branch 'rs-issue-1939' into 'master'

Minor style fixes ### Reset ul list style types inside notes Because notes are themselves `ul`s, lists inside of notes started at the wrong depth, so this resets that. Closes #259 --- ### Style all blockquote children, not just p Makes styling of non-paragraph text, such as lists, inside blockquotes consistent. Closes #1939 See merge request !949

Merge branch 'rs-issue-1939' into 'master'
e745b9e3 · Marin Jankovski · 3f5a4ae5 · 4498de48 · e745b9e3 · e745b9e3
Commit e745b9e3 authored Jul 10, 2015 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 1 deletion

mixins.scss app/assets/stylesheets/base/mixins.scss +1 -1

notes.scss app/assets/stylesheets/pages/notes.scss +16 -0

No files found.
--- a/app/assets/stylesheets/base/mixins.scss
+++ b/app/assets/stylesheets/base/mixins.scss
@@ -109,7 +109,7 @@
    font-size: 1.2em;
  }

-  blockquote p {
+  blockquote {
    color: #888;
    font-size: 15px;
    line-height: 1.5;

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -72,13 +72,28 @@ ul.notes {
  .note {
    display: block;
    position:relative;
+
    .note-body {
      overflow: auto;
+
      .note-text {
        overflow: auto;
        word-wrap: break-word;
        @include md-typography;

+        // Reset ul style types since we're nested inside a ul already
+        & > ul {
+          list-style-type: disc;
+
+          ul {
+            list-style-type: circle;
+
+            ul {
+              list-style-type: square;
+            }
+          }
+        }
+
        // Reduce left padding of first task list ul element
        ul.task-list:first-child {
          padding-left: 10px;
@@ -94,6 +109,7 @@ ul.notes {
        }
      }
    }
+
    .note-header {
      padding-bottom: 3px;
    }