From bb2745d7a5e797c157f35faf19eb6f6d4f9f1509 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Fri, 12 Nov 2010 10:14:47 -0800 Subject: [PATCH] Port of blueprint commit: commit a6f9b2d85fe31e30e6336835f4a3d5505892a595 Author: Christian Montoya Date: Tue Sep 14 20:50:56 2010 -0400 Fixed list padding --- frameworks/blueprint/stylesheets/blueprint/_typography.scss | 2 +- test/fixtures/stylesheets/blueprint/css/screen.css | 2 +- .../stylesheets/blueprint/css/single-imports/typography.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/blueprint/stylesheets/blueprint/_typography.scss b/frameworks/blueprint/stylesheets/blueprint/_typography.scss index 6697aecc..c56a755d 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_typography.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_typography.scss @@ -72,7 +72,7 @@ $blueprint-font-size: 12px !default; pre { margin: 1.5em 0; white-space: pre; } pre, code, tt { @include fixed-width-text; } li ul, li ol { margin: 0; } - ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; } + ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 1.5em; } ul { list-style-type: disc; } ol { list-style-type: decimal; } dl { margin: 0 0 1.5em 0; diff --git a/test/fixtures/stylesheets/blueprint/css/screen.css b/test/fixtures/stylesheets/blueprint/css/screen.css index ab348d06..28993645 100644 --- a/test/fixtures/stylesheets/blueprint/css/screen.css +++ b/test/fixtures/stylesheets/blueprint/css/screen.css @@ -148,7 +148,7 @@ li ul, li ol { ul, ol { margin: 0 1.5em 1.5em 0; - padding-left: 3.333em; } + padding-left: 1.5em; } ul { list-style-type: disc; } diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css b/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css index 2505e3c0..c7ea601c 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css @@ -104,7 +104,7 @@ li ul, li ol { ul, ol { margin: 0 1.5em 1.5em 0; - padding-left: 3.333em; } + padding-left: 1.5em; } ul { list-style-type: disc; }