Merge branch 'dz-improve-content-list' into 'master'

Set consistency in list text height css Fix line height of list row. Now its 42px everywhere. Before this merge request certain row height varied from 40 to 45px. Sometimes even inside one list. cc @jschatz1 @connorshea See merge request !5666

Merge branch 'dz-improve-content-list' into 'master'
6df51b35 · Dmitriy Zaporozhets · 96abb192 · 4e0c62c6 · 6df51b35 · 6df51b35
Commit 6df51b35 authored Aug 04, 2016 by Dmitriy Zaporozhets
4 changed files
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -114,6 +114,12 @@ ul.content-list {
    font-size: $list-font-size;
    color: $list-text-color;

+    &.no-description {
+      .title {
+        line-height: $list-text-height;
+      }
+    }
+
    .title {
      font-weight: 600;
    }
@@ -134,12 +140,11 @@ ul.content-list {
    }

    .controls {
-      padding-top: 1px;
      float: right;

      > .control-text {
        margin-right: $gl-padding-top;
-        line-height: 40px;
+        line-height: $list-text-height;

        &:last-child {
          margin-right: 0;
@@ -150,7 +155,7 @@ ul.content-list {
      > .btn-group {
        margin-right: $gl-padding-top;
        display: inline-block;
-        margin-top: 4px;
+        margin-top: 3px;
        margin-bottom: 4px;

        &:last-child {

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -43,6 +43,7 @@ $gl-header-color:      $gl-title-color;
 $list-font-size:   $gl-font-size;
 $list-title-color: $gl-title-color;
 $list-text-color:  $gl-text-color;
+$list-text-height: 42px;

 /*
 * Markdown

--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -23,15 +23,9 @@
 }

 .group-row {
-  &.no-description {
-    .group-name {
-      line-height: 44px;
-    }
-  }
-
  .stats {
    float: right;
-    line-height: 44px;
+    line-height: $list-text-height;
    color: $gl-gray;

    span {

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -512,18 +512,12 @@ pre.light-well {
  .project-row {
    border-color: $table-border-color;

-    &.no-description {
-      .project {
-        line-height: 40px;
-      }
-    }
-
    .project-full-name {
      @include str-truncated;
    }

    .controls {
-      line-height: 40px;
+      line-height: $list-text-height;

      a:hover {
        text-decoration: none;