From dabed3d61d373ff5b97d867a142e934010ea76a0 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Thu, 10 Jul 2014 17:35:33 -0400
Subject: [PATCH] Fix celled/divided ordered lists

---
 server/documents/views/list.html.eco           | 12 +-----------
 src/definitions/views/list.less                | 18 +++++++++---------
 .../packages/default/elements/icon.overrides   |  2 +-
 .../packages/default/globals/site.variables    |  2 +-
 .../packages/default/views/list.variables      |  3 ++-
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/server/documents/views/list.html.eco b/server/documents/views/list.html.eco
index 5d7118dfc..0a272b676 100755
--- a/server/documents/views/list.html.eco
+++ b/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">
diff --git a/src/definitions/views/list.less b/src/definitions/views/list.less
index 6ef467faa..4095d4d45 100755
--- a/src/definitions/views/list.less
+++ b/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 {
diff --git a/src/themes/packages/default/elements/icon.overrides b/src/themes/packages/default/elements/icon.overrides
index 16587431f..6979dcf3b 100755
--- a/src/themes/packages/default/elements/icon.overrides
+++ b/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"; }
diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables
index db5f2e96e..d81fca2d7 100755
--- a/src/themes/packages/default/globals/site.variables
+++ b/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);
 
 /*-------------------
diff --git a/src/themes/packages/default/views/list.variables b/src/themes/packages/default/views/list.variables
index 3921451c7..f82b36660 100755
--- a/src/themes/packages/default/views/list.variables
+++ b/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;