]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Fix ordered lists and nested lists - fixes #756 757/head
authorAaron D. Campbell <aaron@xavisys.com>
Sun, 5 Aug 2012 16:27:31 +0000 (09:27 -0700)
committerAaron D. Campbell <aaron@xavisys.com>
Sun, 5 Aug 2012 16:27:31 +0000 (09:27 -0700)
stylesheets/foundation/common/_typography.scss

index 12ac4f43623946c45ad1fe30be47b7c329ccf7bd..c01487bb4e3d43d33bd48fb8b1b3ec34f80a3bf0 100644 (file)
   code { font-weight: bold; background: $highlightColor; }
 
   /* Lists ---------------------- */
-  ul, ol { font-size: ms(0); line-height: 1.6; margin-bottom: ms(1); list-style-position: outside; }
+  ul, ol { font-size: ms(0); line-height: 1.6; margin-bottom: ms(1); list-style-position: inside; }
   ul {
     li {
-      ul { margin-left: 20px; margin-bottom: 0; list-style: outside; }
+      ul, ol { margin-left: 20px; margin-bottom: 0; }
     }
     &.square, &.circle, &.disc { margin-left: ms(1); }
     &.square { list-style-type: square;
     &.no-bullet { list-style: none; }
     &.large li { line-height: 21px; }
   }
-
+  ol {
+    li {
+      ul, ol { margin-left: 20px; margin-bottom: 0; }
+    }
+  }
 
   /* Blockquotes ---------------------- */
   blockquote, blockquote p { line-height: 1.5; color: lighten($headerFontColor, 30%); }