Browse Source

List: bulleted/ordered now display correctly centered, reduced ordered list indent on sub-list

pull/1243/merge
jlukic 10 years ago
parent
commit
dc7e403013
2 changed files with 7 additions and 20 deletions
  1. 25
      src/definitions/elements/list.less
  2. 2
      src/themes/default/elements/list.variables

25
src/definitions/elements/list.less

@ -526,7 +526,8 @@ ul.ui.list li:before,
.ui.bulleted.list > .item:before { .ui.bulleted.list > .item:before {
position: absolute; position: absolute;
top: auto; top: auto;
left: @bulletOffset;
left: auto;
margin-left: @bulletOffset;
content: @bulletCharacter; content: @bulletCharacter;
opacity: @bulletOpacity; opacity: @bulletOpacity;
color: @bulletColor; color: @bulletColor;
@ -582,7 +583,9 @@ ol.ui.list li:before,
.ui.ordered.list .list > .item:before, .ui.ordered.list .list > .item:before,
.ui.ordered.list > .item:before { .ui.ordered.list > .item:before {
position: absolute; position: absolute;
left: -(@orderedCountDistance);
top: auto;
left: auto;
margin-left: -(@orderedCountDistance);
counter-increment: @orderedCountName; counter-increment: @orderedCountName;
content: @orderedCountContent; content: @orderedCountContent;
text-align: @orderedCountTextAlign; text-align: @orderedCountTextAlign;
@ -599,7 +602,7 @@ ol.ui.list ol,
} }
ol.ui.list ol li:before, ol.ui.list ol li:before,
.ui.ordered.list .list > .item:before { .ui.ordered.list .list > .item:before {
left: @orderedChildCountOffset;
margin-left: @orderedChildCountOffset;
} }
/* Horizontal Ordered */ /* Horizontal Ordered */
@ -648,10 +651,6 @@ ol.ui.horizontal.list li:before,
.ui.divided.bulleted.list > .item:not(.horizontal) { .ui.divided.bulleted.list > .item:not(.horizontal) {
padding-left: @bulletDistance; padding-left: @bulletDistance;
} }
.ui.divided.bulleted.list .list > .item:before,
.ui.divided.bulleted.list > .item:before {
left: 0em;
}
/* Divided Ordered */ /* Divided Ordered */
.ui.divided.ordered.list { .ui.divided.ordered.list {
@ -661,10 +660,6 @@ ol.ui.horizontal.list li:before,
.ui.divided.ordered.list > .item { .ui.divided.ordered.list > .item {
padding-left: @orderedCountDistance; padding-left: @orderedCountDistance;
} }
.ui.divided.ordered.list .list > .item:before,
.ui.divided.ordered.list > .item:before {
left: 0em;
}
.ui.divided.ordered.list .item .list { .ui.divided.ordered.list .item .list {
margin-left: 0em; margin-left: 0em;
margin-right: 0em; margin-right: 0em;
@ -741,10 +736,6 @@ ol.ui.horizontal.list li:before,
.ui.celled.bulleted.list > .item { .ui.celled.bulleted.list > .item {
padding-left: (@bulletDistance); padding-left: (@bulletDistance);
} }
.ui.celled.bulleted.list .list > .item:before,
.ui.celled.bulleted.list > .item:before {
left: 0em;
}
.ui.celled.bulleted.list .item .list { .ui.celled.bulleted.list .item .list {
margin-left: -(@bulletDistance); margin-left: -(@bulletDistance);
margin-right: -(@bulletDistance); margin-right: -(@bulletDistance);
@ -759,10 +750,6 @@ ol.ui.horizontal.list li:before,
.ui.celled.ordered.list > .item { .ui.celled.ordered.list > .item {
padding-left: @orderedCountDistance; padding-left: @orderedCountDistance;
} }
.ui.celled.ordered.list .list > .item:before,
.ui.celled.ordered.list > .item:before {
left: 0em;
}
.ui.celled.ordered.list .item .list { .ui.celled.ordered.list .item .list {
margin-left: 0em; margin-left: 0em;
margin-right: 0em; margin-right: 0em;

2
src/themes/default/elements/list.variables

@ -162,7 +162,7 @@
@orderedCountTextAlign: right; @orderedCountTextAlign: right;
@orderedCountVerticalAlign: middle; @orderedCountVerticalAlign: middle;
@orderedChildCountDistance: 2em;
@orderedChildCountDistance: 1em;
@orderedChildCountOffset: -2em; @orderedChildCountOffset: -2em;
/* Horizontal Ordereded */ /* Horizontal Ordereded */

Loading…
Cancel
Save