Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'

# Conflicts:
#   app/assets/javascripts/dispatcher.js
#   app/assets/stylesheets/pages/projects.scss

1 files changed, 56 insertions, 57 deletions

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 7c93ee8af18..960875674cc 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -459,34 +459,13 @@ a.deploy-project-label {
     flex-wrap: wrap;
 
     .btn {
-      margin: 0 10px 10px 0;
       padding: 8px;
+      margin-left: 10px;
     }
 
     > div {
+      margin-bottom: 10px;
       padding-left: 0;
-
-      &:last-child {
-        margin-bottom: 0;
-
-        .btn {
-          margin-right: 0;
-        }
-      }
-    }
-  }
-}
-
-.page-sidebar-pinned {
-  .project-stats .nav > li.right {
-    @media (min-width: $screen-lg-min) {
-      float: none;
-    }
-  }
-
-  .download-button {
-    @media (min-width: $screen-lg-min) {
-      margin-left: 0;
     }
   }
 }
@@ -582,54 +561,65 @@ pre.light-well {
 /*
  * Projects list rendered on dashboard and user page
  */
-
 .projects-list {
   @include basic-list;
+  display: flex;
+  flex-direction: column;
 
-  .project-row {
-    border-color: $white-normal;
+  // Disable Flexbox for admin page
+  &.admin-projects {
+    display: block;
 
-    .project-full-name {
-      @include str-truncated;
-
-      @media (max-width: $screen-xs-max) {
-        max-width: 50%;
-      }
+    .project-row {
+      display: block;
     }
+  }
 
-    .controls {
-      line-height: $list-text-height;
+  .project-row {
+    display: flex;
+    align-items: center;
+    @include basic-list-stats;
+  }
 
-      .badge {
-        @media (max-width: $screen-xs-max) {
-          display: none;
-        }
-      }
+  h3 {
+    font-size: $gl-font-size;
+  }
 
-      a:hover {
-        text-decoration: none;
-      }
+  a {
+    color: $gl-text-color;
+  }
 
-      > span {
-        margin-left: 10px;
-      }
+  .avatar-container,
+  .controls {
+    flex: 0 0 auto;
+  }
 
-      svg {
-        position: relative;
-        top: 2px;
-      }
-    }
+  .avatar-container {
+    align-self: flex-start;
+  }
 
-    .description p {
-      @media (max-width: $screen-xs-max) {
-        max-width: 50%;
-      }
+  .project-details {
+    min-width: 0;
+
+    p,
+    .commit-row-message {
+      @include str-truncated(100%);
+      margin-bottom: 0;
     }
   }
 
-  .bottom {
-    padding-top: $gl-padding;
-    padding-bottom: 0;
+  .controls {
+    margin-left: auto;
+  }
+
+  .ci-status-link {
+    display: inline-block;
+    line-height: 17px;
+    vertical-align: middle;
+
+    &:hover {
+      text-decoration: none;
+    }
   }
 }
 
@@ -745,6 +735,15 @@ pre.light-well {
   }
 }
 
+.create-new-protected-branch-button {
+  @include dropdown-link;
+
+  width: 100%;
+  background-color: transparent;
+  border: 0;
+  text-align: left;
+}
+
 .protected-branches-list,
 .protected-tags-list {
   margin-bottom: 30px;