Merge branch 'master' of git@github.com:easysoft/zui

assets/css/doc.css

@@ -96,3 +96,14 @@ body > article.article-small
   display: block;
   margin-bottom: 5px;
 }
+
+.media
+{
+  max-width: 100%;
+  text-align: center;
+  vertical-align: middle;
+  color: #aaa;
+  background-color: #eee;
+  border:1px solid #ddd;
+  font-size: 20px;
+}
\ No newline at end of file

dist/css/zui.css

@@ -243,6 +243,11 @@ textarea {
 a {
   color: #506eaf;
   text-decoration: none;
+  -webkit-transition: all 0.2s ease-in;
+  -moz-transition: all 0.2s ease-in;
+  -o-transition: all 0.2s ease-in;
+  -ms-transition: all 0.2s ease-in;
+  transition: all 0.2s ease-in;
 }
 a:hover,
 a:focus {
@@ -2059,11 +2064,11 @@ hr {
   white-space: nowrap;
   vertical-align: baseline;
   border-radius: .25em;
-  background-color: #dddddd;
+  background-color: #999999;
 }
 .label[href]:hover,
 .label[href]:focus {
-  background-color: #c4c4c4;
+  background-color: #808080;
 }
 .label[href]:hover,
 .label[href]:focus {
@@ -6014,3 +6019,98 @@ html[lang="zh-cn"] .article > section p {
 .comment > .comments-list > .comment:last-child {
   padding-bottom: 0;
 }
+.list {
+  padding: 0 15px;
+}
+.list > header {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #e5e5e5;
+}
+.items > .item {
+  border-bottom: 1px solid #e5e5e5;
+  padding: 10px 0;
+  -webkit-transition: all 0.2s ease-in;
+  -moz-transition: all 0.2s ease-in;
+  -o-transition: all 0.2s ease-in;
+  -ms-transition: all 0.2s ease-in;
+  transition: all 0.2s ease-in;
+}
+.items > .item a {
+  color: #333333;
+}
+.items > .item:hover a,
+.items > .item:hover > .item-heading > .pull-right > a,
+.items > .item:hover > .item-footer > a {
+  color: #506eaf;
+}
+.items > .item > .item-heading > h6,
+.items > .item > .item-heading h5,
+.items > .item > .item-heading h4,
+.items > .item > .item-heading h3,
+.items > .item > .item-heading h2,
+.items > .item > .item-heading h1,
+.items > .item > .item-heading .h6,
+.items > .item > .item-heading .h5,
+.items > .item > .item-heading .h4,
+.items > .item > .item-heading .h3,
+.items > .item > .item-heading .h2,
+.items > .item > .item-heading .h1 {
+  margin-top: 5px;
+}
+.items > .item > .item-heading > .pull-right > a {
+  color: #dddddd;
+}
+.items > .item > .item-content:before,
+.items > .item > .item-content:after {
+  content: " ";
+  /* 1 */
+
+  display: table;
+  /* 2 */
+
+}
+.items > .item > .item-content:after {
+  clear: both;
+}
+.items > .item > .item-content:before,
+.items > .item > .item-content:after {
+  content: " ";
+  /* 1 */
+
+  display: table;
+  /* 2 */
+
+}
+.items > .item > .item-content:after {
+  clear: both;
+}
+.items > .item > .item-content > .media {
+  margin: 6px 0;
+}
+.items > .item > .item-content > .media.pull-left {
+  margin: 0;
+  margin-right: 10px;
+}
+.items > .item > .item-content > .media.pull-right {
+  margin: 0;
+  margin-left: 10px;
+}
+.items > .item > .item-footer {
+  padding-top: 6px;
+}
+.items > .item > .item-footer > a {
+  color: #999999;
+}
+.items-hover > .item:hover {
+  padding: 10px;
+  background-color: #f5f5f5;
+}
+.list-condensed {
+  padding: 0;
+}
+.list-condensed > header,
+.list-condensed > footer,
+.list-condensed > .items > .item {
+  padding-left: 15px;
+  padding-right: 15px;
+}

src/less/basic/scaffolding.less

@@ -39,6 +39,7 @@ a
 {
   color: @link-color;
   text-decoration: none;
+  .transition(all, @animation-speed-normal, @animation-type);
 
   &:hover,
   &:focus

src/less/basic/variables.less

@@ -321,7 +321,7 @@
 // Labels
 // -------------------------
 
-@label-default-bg:            @gray-light;
+@label-default-bg:            @gray;
 @label-primary-bg:            @color-primary;
 @label-success-bg:            @color-success;
 @label-info-bg:               @color-info;
@@ -510,6 +510,12 @@
 @article-font-size-h6:            ceil(@font-size-base * 0.85); // 12px
 @article-headings-border-color:   @gray-light;
 
+// Contents List
+// -----------------------
+
+@list-padding:                15px;
+@list-item-bg-hover:          #f5f5f5;
+
 
 // Pager
 // -------------------------

src/less/views/list.less

+.list
+{
+  padding: 0 @list-padding;
+  > header
+  {
+    padding-bottom: 10px;
+    border-bottom: 1px solid @gray-lighter;
+  }
+
+}
+
+
+.items
+{
+  > .item
+  {
+    border-bottom: 1px solid @gray-lighter;
+    padding: 10px 0;
+    .transition(all,@animation-speed-normal,@animation-type);
+
+    a
+    {
+      color: @color-fore;
+    }
+
+    &:hover
+    {
+      a,
+      > .item-heading > .pull-right > a,
+      > .item-footer > a
+      {
+        color: @link-color;
+      }
+    }
+
+    > .item-heading
+    {
+      > h6, h5, h4, h3,h2,h1, .h6, .h5, .h4, .h3,.h2,.h1
+      {
+        margin-top: 5px;
+      }
+
+      > .pull-right
+      {
+        > a
+        {
+          color: @gray-light;
+        }
+      }
+    }
+
+    > .item-content
+    {
+      .clearfix();
+      > .media
+      {
+        margin: @padding-base-vertical 0;
+        &.pull-left
+        {
+          margin: 0;
+          margin-right: @padding-small-horizontal;
+        }
+        
+        &.pull-right
+        {
+          margin: 0;
+          margin-left: @padding-small-horizontal;
+        }
+      }
+    }
+
+    > .item-footer
+    {
+      > a
+      {
+        color: @gray;
+      }
+      padding-top: @padding-base-vertical;
+    }
+  }
+}
+
+.items-hover
+{
+  > .item
+  {
+    &:hover
+    {
+      padding:10px;
+      background-color: @list-item-bg-hover;
+    }
+  }
+}
+
+.list-condensed
+{
+  padding: 0;
+
+  > header,
+  > footer,
+  > .items > .item
+  {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+}
\ No newline at end of file

src/less/zui.less

@@ -75,3 +75,4 @@
 
 @import "views/article.less";
 @import "views/comment.less";
+@import "views/list.less";