From dc7e4030138cc2e3447dd93f0dd11d5c5c71eca1 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 13 Nov 2014 17:22:11 -0500 Subject: [PATCH] List: bulleted/ordered now display correctly centered, reduced ordered list indent on sub-list --- src/definitions/elements/list.less | 25 ++++++---------------- src/themes/default/elements/list.variables | 2 +- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/definitions/elements/list.less b/src/definitions/elements/list.less index 9505edfbb..8a0d4b4b2 100755 --- a/src/definitions/elements/list.less +++ b/src/definitions/elements/list.less @@ -526,7 +526,8 @@ ul.ui.list li:before, .ui.bulleted.list > .item:before { position: absolute; top: auto; - left: @bulletOffset; + left: auto; + margin-left: @bulletOffset; content: @bulletCharacter; opacity: @bulletOpacity; color: @bulletColor; @@ -582,7 +583,9 @@ ol.ui.list li:before, .ui.ordered.list .list > .item:before, .ui.ordered.list > .item:before { position: absolute; - left: -(@orderedCountDistance); + top: auto; + left: auto; + margin-left: -(@orderedCountDistance); counter-increment: @orderedCountName; content: @orderedCountContent; text-align: @orderedCountTextAlign; @@ -599,7 +602,7 @@ ol.ui.list ol, } ol.ui.list ol li:before, .ui.ordered.list .list > .item:before { - left: @orderedChildCountOffset; + margin-left: @orderedChildCountOffset; } /* Horizontal Ordered */ @@ -648,10 +651,6 @@ ol.ui.horizontal.list li:before, .ui.divided.bulleted.list > .item:not(.horizontal) { padding-left: @bulletDistance; } -.ui.divided.bulleted.list .list > .item:before, -.ui.divided.bulleted.list > .item:before { - left: 0em; -} /* Divided Ordered */ .ui.divided.ordered.list { @@ -661,10 +660,6 @@ ol.ui.horizontal.list li:before, .ui.divided.ordered.list > .item { padding-left: @orderedCountDistance; } -.ui.divided.ordered.list .list > .item:before, -.ui.divided.ordered.list > .item:before { - left: 0em; -} .ui.divided.ordered.list .item .list { margin-left: 0em; margin-right: 0em; @@ -741,10 +736,6 @@ ol.ui.horizontal.list li:before, .ui.celled.bulleted.list > .item { padding-left: (@bulletDistance); } -.ui.celled.bulleted.list .list > .item:before, -.ui.celled.bulleted.list > .item:before { - left: 0em; -} .ui.celled.bulleted.list .item .list { margin-left: -(@bulletDistance); margin-right: -(@bulletDistance); @@ -759,10 +750,6 @@ ol.ui.horizontal.list li:before, .ui.celled.ordered.list > .item { padding-left: @orderedCountDistance; } -.ui.celled.ordered.list .list > .item:before, -.ui.celled.ordered.list > .item:before { - left: 0em; -} .ui.celled.ordered.list .item .list { margin-left: 0em; margin-right: 0em; diff --git a/src/themes/default/elements/list.variables b/src/themes/default/elements/list.variables index ad5371f46..4e2f5af8c 100644 --- a/src/themes/default/elements/list.variables +++ b/src/themes/default/elements/list.variables @@ -162,7 +162,7 @@ @orderedCountTextAlign: right; @orderedCountVerticalAlign: middle; -@orderedChildCountDistance: 2em; +@orderedChildCountDistance: 1em; @orderedChildCountOffset: -2em; /* Horizontal Ordereded */