Browse Source

Fix celled/divided ordered lists

pull/954/head
jlukic 10 years ago
parent
commit
dabed3d61d
5 changed files with 14 additions and 23 deletions
  1. 12
      server/documents/views/list.html.eco
  2. 18
      src/definitions/views/list.less
  3. 2
      src/themes/packages/default/elements/icon.overrides
  4. 2
      src/themes/packages/default/globals/site.variables
  5. 3
      src/themes/packages/default/views/list.variables

12
server/documents/views/list.html.eco

@ -595,17 +595,6 @@ themes : ['Default']
<div class="content">
<div class="header">Poodle</div>
A poodle, its pretty basic
<div class="list">
<div class="item">
Can be quite caring
</div>
<div class="item">
Knows how to have fun in water
</div>
<div class="item">
Does not get tired of fetch
</div>
</div>
</div>
</div>
<div class="item">
@ -628,6 +617,7 @@ themes : ['Default']
<div class="item">Mastiff</div>
</div>
</div>
<div class="item">Horses Again</div>
</div>
</div>
<div class="another example">

18
src/definitions/views/list.less

@ -127,6 +127,9 @@ ol.ui.list ol,
}
/* Content */
.ui.list .item > .content {
line-height: @contentLineHeight;
}
.ui.list .item > .image + .content,
.ui.list .item > .icon + .content {
display: table-cell;
@ -518,8 +521,8 @@ ol.ui.horizontal.list li:before,
left: 0em;
}
.ui.divided.ordered.list .item .list {
margin-left: -(@orderedChildCountDistance);
margin-right: -(@orderedChildCountDistance);
margin-left: 0em;
margin-right: 0em;
padding-bottom: @itemVerticalPadding;
}
.ui.divided.ordered.list .item .list .item {
@ -547,15 +550,12 @@ ol.ui.horizontal.list li:before,
/* Inverted */
.ui.divided.inverted.list > .item,
.ui.divided.inverted.list > .list {
border-color: @dividedInvertedBorder;
}
.ui.divided.inverted.list > .list,
.ui.divided.inverted.horizontal.list .item {
border-color: @dividedInvertedBorder;
border-color: @dividedInvertedBorderColor;
}
/*-------------------
Celled
--------------------*/
@ -614,8 +614,8 @@ ol.ui.horizontal.list li:before,
left: 0em;
}
.ui.celled.ordered.list .item .list {
margin-left: -(@orderedChildCountDistance);
margin-right: -(@orderedChildCountDistance);
margin-left: 0em;
margin-right: 0em;
padding-bottom: @itemVerticalPadding;
}
.ui.celled.ordered.list .item .list .item {

2
src/themes/packages/default/elements/icon.overrides

@ -530,7 +530,7 @@ i.icon.wechat:before { content: "\f1d7"; }
Aliases
*******************************/
i.icon.like:before { content: "\f004"; }
i.icon.video:before { content: "\f008"; }
i.icon.sidebar:before { content: "\f00b"; }
i.icon.check:before { content: "\f00c"; }

2
src/themes/packages/default/globals/site.variables

@ -250,7 +250,7 @@
@selectedBorderColor : rgba(0, 0, 0, 0.2);
@solidBorderColor : #DDDDDD;
@whiteBorderColor : rgba(255, 255, 255, 0.3);
@whiteBorderColor : rgba(255, 255, 255, 0.2);
@selectedWhiteBorderColor : rgba(255, 255, 255, 0.8);
/*-------------------

3
src/themes/packages/default/views/list.variables

@ -48,6 +48,7 @@
/* Content */
@contentDistance: 0.5em;
@contentLineHeight: 1.2em;
@contentAlign: middle;
/* Link */
@ -164,7 +165,7 @@
/* Divided */
@dividedBorderWidth: 1px;
@dividedBorder: @dividedBorderWidth solid @borderColor;
@dividedInvertedBorder: @dividedBorderWidth solid @whiteBorderColor;
@dividedInvertedBorderColor: @whiteBorderColor;
@dividedChildListBorder: none;
@dividedChildItemBorder: none;

Loading…
Cancel
Save