From 6970c1f331e1f56424ff90fe43113d9f512bce95 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 2 Nov 2016 16:41:32 +0100
Subject: Allow to use Dockerfile templates

---
 app/assets/stylesheets/pages/editor.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 778126bcfb7..ac968618c79 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -67,7 +67,8 @@
   .soft-wrap-toggle,
   .license-selector,
   .gitignore-selector,
-  .gitlab-ci-yml-selector {
+  .gitlab-ci-yml-selector,
+  .dockerfile-selector {
     display: inline-block;
     vertical-align: top;
     font-family: $regular_font;
@@ -97,7 +98,8 @@
 
   .gitignore-selector,
   .license-selector,
-  .gitlab-ci-yml-selector {
+  .gitlab-ci-yml-selector,
+  .dockerfile-selector {
     .dropdown {
       line-height: 21px;
     }
-- 
cgit v1.2.1


From c3c9122d1e6aa532ad213394c4758653d4cf3874 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 5 Dec 2016 17:04:36 +0000
Subject: Adds new hover state Fixes the line that connects the dots

Adds style for the badge

Add new style for status text

Fix badge style

Adjust font weight
---
 app/assets/stylesheets/framework/variables.scss |  7 +++++
 app/assets/stylesheets/pages/pipelines.scss     | 34 ++++++++++++++++++-------
 2 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 18716813c48..0591801d259 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -571,3 +571,10 @@ $body-text-shadow: rgba(255,255,255,0.01);
 */
 $ui-dev-kit-example-color: #bbb;
 $ui-dev-kit-example-border: #ddd;
+
+/*
+Pipeline Graph
+*/
+$stage-hover-bg: #eaf3fc;
+$stage-hover-border: #d1e7fc;
+$stage-bagde-text: #d4d4d4;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 08062b85504..cc8d4dd9544 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -363,15 +363,22 @@
 
   .build {
     border: 1px solid $border-color;
+    border-radius: 30px;
     background-color: $white-light;
+    color: $gl-text-color;
     position: relative;
     padding: 7px 10px 8px;
-    border-radius: 30px;
     width: 186px;
     margin-bottom: 10px;
 
     &:hover {
-      background-color: $gray-lighter;
+      background-color: $stage-hover-bg;
+      border: 1px solid $stage-hover-border;
+
+      .ci-status-text,
+      .dropdown-counter-bagde {
+        color: $gl-text-color;
+      }
     }
 
     &.playable {
@@ -411,14 +418,14 @@
       }
 
       .ci-status-text {
-        width: 135px;
+        max-width: 110px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        vertical-align: middle;
+        vertical-align: bottom;
         display: inline-block;
         position: relative;
-        top: -1px;
+        font-weight: 100;
       }
 
       a {
@@ -435,7 +442,7 @@
         flex-grow: 1;
 
         .ci-status-text {
-          max-width: 112px;
+          max-width: 110px;
           width: auto;
         }
       }
@@ -480,7 +487,7 @@
         }
 
         .ci-status-text {
-          width: 112px;
+          width: 110px;
         }
 
         .arrow {
@@ -520,9 +527,18 @@
       }
     }
 
+    .dropdown-counter-bagde {
+      float: right;
+      color: $stage-bagde-text;
+      font-weight: 100;
+      font-size: 13px;
+      margin-top: 1px;
+      margin-right: 2px;
+    }
+
     svg {
       vertical-align: middle;
-      margin-right: 5px;
+      margin-right: 3px;
     }
 
     // Connect first build in each stage with right horizontal line
@@ -531,7 +547,7 @@
         content: '';
         position: absolute;
         top: 48%;
-        right: -48px;
+        right: -49px;
         border-top: 2px solid $border-color;
         width: 48px;
         height: 1px;
-- 
cgit v1.2.1


From f9c103c2f314a2f9edbdfb93a26ace597d62e7e6 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 6 Dec 2016 11:56:50 +0000
Subject: Fix tooltip to show the all name

CSS - Changes to look like newest mockups
- Simplifies nested elements
- Divides nodes from lines

Remove is playable from left side

Remove nested elements in scss

Improve dropdown

Focus state

Fix scss linter
Remove not used css

Fix typo
---
 app/assets/stylesheets/pages/pipelines.scss | 498 +++++++++++++---------------
 1 file changed, 229 insertions(+), 269 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index cc8d4dd9544..cd7df7beda8 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -287,15 +287,40 @@
 }
 
 // Pipeline visualization
+.pipeline-actions {
+  border-bottom: none;
+}
 
-.toggle-pipeline-btn {
-  background-color: $gray-dark;
+.tab-pane {
+  &.pipelines {
+    .ci-table {
+      min-width: 900px;
+    }
 
-  &.graph-collapsed {
-    background-color: $white-light;
+    .content-list.pipelines {
+      overflow: auto;
+    }
+
+    .stage {
+      max-width: 100px;
+      width: 100px;
+    }
+
+    .pipeline-actions {
+      min-width: initial;
+    }
+  }
+
+  &.builds {
+    .ci-table {
+      tr {
+        height: 71px;
+      }
+    }
   }
 }
 
+// Pipeline graph
 .pipeline-graph {
   width: 100%;
   background-color: $background-color;
@@ -304,52 +329,120 @@
   white-space: nowrap;
   transition: max-height 0.3s, padding 0.3s;
 
-  &.graph-collapsed {
-    max-height: 0;
-    padding: 0 16px;
-  }
-}
-
-.pipeline-visualization {
-  position: relative;
-
   ul {
     padding: 0;
   }
-}
 
-.stage-column {
-  display: inline-block;
-  vertical-align: top;
+  a {
+    text-decoration: none;
+    color: $gl-text-color-light;
+  }
 
-  &:not(:last-child) {
-    margin-right: 44px;
+  svg {
+    vertical-align: middle;
+    margin-right: 3px;
   }
 
-  &.left-margin {
-    &:not(:first-child) {
-      margin-left: 44px;
+  .stage-column {
+    display: inline-block;
+    vertical-align: top;
 
-      .left-connector {
-        &::before {
-          content: '';
-          position: absolute;
-          top: 48%;
-          left: -48px;
-          border-top: 2px solid $border-color;
-          width: 48px;
-          height: 1px;
+    &:not(:last-child) {
+      margin-right: 44px;
+    }
+
+    &.left-margin {
+      &:not(:first-child) {
+        margin-left: 44px;
+
+        .left-connector {
+          &::before {
+            content: '';
+            position: absolute;
+            top: 48%;
+            left: -48px;
+            border-top: 2px solid $border-color;
+            width: 48px;
+            height: 1px;
+          }
         }
       }
     }
-  }
 
-  &.no-margin {
-    margin: 0;
-  }
+    &.no-margin {
+      margin: 0;
+    }
 
-  li {
-    list-style: none;
+    li {
+      list-style: none;
+    }
+
+    &:last-child {
+      .build {
+        // Remove right connecting horizontal line from first build in last stage
+        &:first-child {
+          &::after {
+            border: none;
+          }
+        }
+        // Remove right curved connectors from all builds in last stage
+        &:not(:first-child) {
+          &::after {
+            border: none;
+          }
+        }
+        // Remove opposite curve
+        .curve {
+          &::before {
+            display: none;
+          }
+        }
+      }
+    }
+
+    &:first-child {
+      .build {
+        // Remove left curved connectors from all builds in first stage
+        &:not(:first-child) {
+          &::before {
+            border: none;
+          }
+        }
+        // Remove opposite curve
+        .curve {
+          &::after {
+            display: none;
+          }
+        }
+      }
+    }
+
+    // Curve first child connecting lines in opposite direction
+    .curve {
+      display: none;
+
+      &::before,
+      &::after {
+        content: '';
+        width: 21px;
+        height: 25px;
+        position: absolute;
+        top: -31px;
+        border-top: 2px solid $border-color;
+      }
+
+      &::after {
+        left: -44px;
+        border-right: 2px solid $border-color;
+        border-radius: 0 20px;
+      }
+
+      &::before {
+        right: -44px;
+        border-left: 2px solid $border-color;
+        border-radius: 20px 0 0;
+      }
+    }
   }
 
   .stage-name {
@@ -365,24 +458,12 @@
     border: 1px solid $border-color;
     border-radius: 30px;
     background-color: $white-light;
-    color: $gl-text-color;
     position: relative;
-    padding: 7px 10px 8px;
+    padding: 8px 10px 9px;
     width: 186px;
     margin-bottom: 10px;
 
-    &:hover {
-      background-color: $stage-hover-bg;
-      border: 1px solid $stage-hover-border;
-
-      .ci-status-text,
-      .dropdown-counter-bagde {
-        color: $gl-text-color;
-      }
-    }
-
     &.playable {
-
       svg {
         height: 13px;
         width: 20px;
@@ -395,150 +476,56 @@
       }
     }
 
-    .build-content {
-      display: -ms-flexbox;
-      display: -webkit-flex;
-      display: flex;
-      width: 164px;
-
-      .ci-status-icon {
-        svg {
-          height: 20px;
-          width: 20px;
-        }
-      }
-
-      .tooltip {
-        white-space: nowrap;
-
-        .tooltip-inner {
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
-
-      .ci-status-text {
-        max-width: 110px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        vertical-align: bottom;
-        display: inline-block;
-        position: relative;
-        font-weight: 100;
-      }
-
-      a {
-        color: $gl-text-color-light;
-        text-decoration: none;
-      }
+    &:hover {
+      background-color: $stage-hover-bg;
+      border: 1px solid $stage-hover-border;
 
+      a,
+      .dropdown-counter-badge,
       .dropdown-menu-toggle {
-        background-color: transparent;
-        border: none;
-        width: auto;
-        padding: 0;
-        color: $gl-text-color-light;
-        flex-grow: 1;
-
-        .ci-status-text {
-          max-width: 110px;
-          width: auto;
-        }
+        color: $gl-text-color;
       }
 
-      .grouped-pipeline-dropdown {
-        padding: 0;
-        width: 186px;
-        left: auto;
-        right: -197px;
-        top: -9px;
-
-        ul {
-          max-height: 245px;
-          overflow: auto;
-
-          li:first-child {
-            padding-top: 8px;
-          }
-
-          li:last-child {
-            padding-bottom: 8px;
-          }
-        }
+      .grouped-pipeline-dropdown a {
+        color: $gl-text-color-light;
 
-        a {
+        &:hover {
           color: $gl-text-color;
-          padding: 7px 8px 8px;
-
-          &:hover {
-            background-color: $blue-light-transparent;
-            border-radius: 3px;
-
-            .ci-status-text {
-              text-decoration: none;
-            }
-          }
-        }
-
-        svg {
-          width: 14px;
-          height: 14px;
-        }
-
-        .ci-status-text {
-          width: 110px;
         }
+      }
+    }
 
-        .arrow {
-          &::before,
-          &::after {
-            content: '';
-            display: inline-block;
-            position: absolute;
-            width: 0;
-            height: 0;
-            border-color: transparent;
-            border-style: solid;
-            top: 18px;
-          }
-
-          &::before {
-            left: -5px;
-            margin-top: -6px;
-            border-width: 7px 5px 7px 0;
-            border-right-color: $border-color;
-          }
+    .ci-status-icon svg {
+      height: 20px;
+      width: 20px;
+    }
 
-          &::after {
-            left: -4px;
-            margin-top: -9px;
-            border-width: 10px 7px 10px 0;
-            border-right-color: $white-light;
-          }
-        }
+    .arrow {
+      &::before,
+      &::after {
+        content: '';
+        display: inline-block;
+        position: absolute;
+        width: 0;
+        height: 0;
+        border-color: transparent;
+        border-style: solid;
+        top: 18px;
       }
 
-      .badge {
-        background-color: $gray-darker;
-        color: $gl-text-color-light;
-        font-weight: normal;
-        margin-left: $btn-xs-side-margin;
+      &::before {
+        left: -5px;
+        margin-top: -6px;
+        border-width: 7px 5px 7px 0;
+        border-right-color: $border-color;
       }
-    }
-
-    .dropdown-counter-bagde {
-      float: right;
-      color: $stage-bagde-text;
-      font-weight: 100;
-      font-size: 13px;
-      margin-top: 1px;
-      margin-right: 2px;
-    }
 
-    svg {
-      vertical-align: middle;
-      margin-right: 3px;
+      &::after {
+        left: -4px;
+        margin-top: -9px;
+        border-width: 10px 7px 10px 0;
+        border-right-color: $white-light;
+      }
     }
 
     // Connect first build in each stage with right horizontal line
@@ -595,113 +582,86 @@
     }
   }
 
-  &:last-child {
-    .build {
-      // Remove right connecting horizontal line from first build in last stage
-      &:first-child {
-        &::after {
-          border: none;
-        }
-      }
-      // Remove right curved connectors from all builds in last stage
-      &:not(:first-child) {
-        &::after {
-          border: none;
-        }
-      }
-      // Remove opposite curve
-      .curve {
-        &::before {
-          display: none;
-        }
-      }
-    }
-  }
-
-  &:first-child {
-    .build {
-      // Remove left curved connectors from all builds in first stage
-      &:not(:first-child) {
-        &::before {
-          border: none;
-        }
-      }
-      // Remove opposite curve
-      .curve {
-        &::after {
-          display: none;
-        }
-      }
-    }
+  .ci-status-text {
+    max-width: 110px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: bottom;
+    display: inline-block;
+    position: relative;
+    font-weight: 100;
   }
 
-  // Curve first child connecting lines in opposite direction
-  .curve {
-    display: none;
+  .dropdown-menu-toggle {
+    background-color: transparent;
+    border: none;
+    padding: 0;
+    color: $gl-text-color-light;
+    flex-grow: 1;
 
-    &::before,
-    &::after {
-      content: '';
-      width: 21px;
-      height: 25px;
-      position: absolute;
-      top: -32px;
-      border-top: 2px solid $border-color;
+    &:focus {
+      outline: none;
     }
 
-    &::after {
-      left: -44px;
-      border-right: 2px solid $border-color;
-      border-radius: 0 20px;
-    }
+    &:hover {
+      color: $gl-text-color;
 
-    &::before {
-      right: -44px;
-      border-left: 2px solid $border-color;
-      border-radius: 20px 0 0;
+      .dropdown-counter-bagde {
+        color: $gl-text-color;
+      }
     }
   }
-}
 
-.pipeline-actions {
-  border-bottom: none;
-}
-
-.toggle-pipeline-btn {
-
-  .fa {
-    color: $dropdown-header-color;
+  .dropdown-counter-bagde {
+    float: right;
+    color: $stage-bagde-text;
+    font-weight: 100;
+    font-size: 13px;
+    margin-top: 1px;
+    margin-right: 2px;
   }
-}
 
-.tab-pane {
+  .grouped-pipeline-dropdown {
+    padding: 0;
+    width: 191px;
+    left: auto;
+    right: -206px;
+    top: -11px;
+    box-shadow: 0 1px 5px $black-transparent;
+
+    ul {
+      max-height: 245px;
+      overflow: auto;
 
-  &.pipelines {
+      li {
+        padding-top: 1px;
+        padding-bottom: 1px;
+      }
 
-    .ci-table {
-      min-width: 900px;
-    }
+      li:first-child {
+        padding-top: 9px;
+      }
 
-    .content-list.pipelines {
-      overflow: auto;
+      li:last-child {
+        padding-bottom: 9px;
+      }
     }
 
-    .stage {
-      max-width: 100px;
-      width: 100px;
-    }
+    a {
+      color: $gl-text-color-light;
+      padding: 7px 8px 8px;
 
-    .pipeline-actions {
-      min-width: initial;
+      &:hover {
+        background-color: $stage-hover-bg;
+        border-radius: 3px;
+        color: $gl-text-color;
+      }
     }
-  }
-
-  &.builds {
 
-    .ci-table {
-      tr {
-        height: 71px;
-      }
+    .ci-status-icon svg {
+      height: 18px;
+      width: 18px;
     }
   }
 }
-- 
cgit v1.2.1


From bd30f75af67240d4069d4a4559faecf4ad7fab5a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 7 Dec 2016 18:03:40 +0000
Subject: Adds actions to the nodes

Improve CSS for dropdown actions
---
 app/assets/stylesheets/framework/variables.scss |  2 +-
 app/assets/stylesheets/pages/pipelines.scss     | 84 ++++++++++++++++++-------
 2 files changed, 63 insertions(+), 23 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 0591801d259..cfb2ed9321b 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -577,4 +577,4 @@ Pipeline Graph
 */
 $stage-hover-bg: #eaf3fc;
 $stage-hover-border: #d1e7fc;
-$stage-bagde-text: #d4d4d4;
+$stage-badge-text: #d4d4d4;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index cd7df7beda8..81cd397ef14 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -463,19 +463,6 @@
     width: 186px;
     margin-bottom: 10px;
 
-    &.playable {
-      svg {
-        height: 13px;
-        width: 20px;
-        position: relative;
-        top: 1px;
-
-        path {
-          fill: $layout-link-gray;
-        }
-      }
-    }
-
     &:hover {
       background-color: $stage-hover-bg;
       border: 1px solid $stage-hover-border;
@@ -607,15 +594,15 @@
     &:hover {
       color: $gl-text-color;
 
-      .dropdown-counter-bagde {
+      .dropdown-counter-badge {
         color: $gl-text-color;
       }
     }
   }
 
-  .dropdown-counter-bagde {
+  .dropdown-counter-badge {
     float: right;
-    color: $stage-bagde-text;
+    color: $stage-badge-text;
     font-weight: 100;
     font-size: 13px;
     margin-top: 1px;
@@ -630,27 +617,49 @@
     top: -11px;
     box-shadow: 0 1px 5px $black-transparent;
 
+    a {
+      display: inline-block;
+
+      &:hover {
+        background-color: $stage-hover-bg;
+      }
+    }
+
     ul {
       max-height: 245px;
       overflow: auto;
 
       li {
-        padding-top: 1px;
-        padding-bottom: 1px;
+        padding-top: 2px;
+        margin: 0 5px;
       }
 
       li:first-child {
-        padding-top: 9px;
+        padding-top: 6px;
       }
 
       li:last-child {
-        padding-bottom: 9px;
+        padding-bottom: 6px;
       }
     }
 
-    a {
+    .dropdown-build {
       color: $gl-text-color-light;
-      padding: 7px 8px 8px;
+
+      a {
+        padding: 7px 8px 8px;
+      }
+
+      a.ci-action-icon-container {
+        padding: 0;
+        font-size: 11px;
+        float: right;
+        margin-top: 5px;
+
+        i {
+          font-size: 11px;
+        }
+      }
 
       &:hover {
         background-color: $stage-hover-bg;
@@ -665,3 +674,34 @@
     }
   }
 }
+
+// Action Icons
+.ci-action-icon-container {
+  padding: 0;
+
+  .ci-action-icon-wrapper {
+    display: inline-block;
+    float: right;
+
+    i {
+      color: $stage-badge-text;
+      border-radius: 100%;
+      border: 1px solid $stage-badge-text;
+      text-align: center;
+      display: table-cell;
+      vertical-align: middle;
+      padding: 5px;
+      font-size: 13px;
+
+      &:hover {
+        color: $gl-text-color;
+        background-color: $stage-hover-bg;
+        border: 1px solid $gl-text-color;
+      }
+    }
+
+    .ci-play-icon {
+      padding: 5px 4px 5px 7px;
+    }
+  }
+}
-- 
cgit v1.2.1


From 2320a5c7118084ed999b9fa0966c3315b94edd67 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 7 Dec 2016 20:28:29 +0000
Subject: Adds new icons for pipeline graph

Fix padding

Fix hover state of icon
---
 app/assets/stylesheets/pages/pipelines.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 81cd397ef14..06b078d5345 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -647,7 +647,7 @@
       color: $gl-text-color-light;
 
       a {
-        padding: 7px 8px 8px;
+        padding: 6px 8px 7px;
       }
 
       a.ci-action-icon-container {
@@ -692,11 +692,12 @@
       vertical-align: middle;
       padding: 5px;
       font-size: 13px;
+      background: $white-light;
 
       &:hover {
         color: $gl-text-color;
         background-color: $stage-hover-bg;
-        border: 1px solid $gl-text-color;
+        border: 1px solid $stage-hover-bg;
       }
     }
 
-- 
cgit v1.2.1


From b4f18a30fb776e28fac405922cb5dfcfdc8ac5d7 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 7 Dec 2016 22:56:47 +0000
Subject: Adds tests for the status and actions icons rendered in the pipeline
 graph

Fix padding in dropdown
---
 app/assets/stylesheets/pages/pipelines.scss | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 06b078d5345..304a7932a06 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -646,10 +646,6 @@
     .dropdown-build {
       color: $gl-text-color-light;
 
-      a {
-        padding: 6px 8px 7px;
-      }
-
       a.ci-action-icon-container {
         padding: 0;
         font-size: 11px;
-- 
cgit v1.2.1


From ee10a1cc5157e78384bac16f9ee2cf43d66513df Mon Sep 17 00:00:00 2001
From: tauriedavis <taurie@gitlab.com>
Date: Wed, 30 Nov 2016 12:37:54 -0800
Subject: 20916 Shorten line length of issues and mrs

---
 app/assets/stylesheets/framework/layout.scss    |  4 ++++
 app/assets/stylesheets/framework/variables.scss |  3 +++
 app/assets/stylesheets/pages/issuable.scss      | 13 +++++++++++++
 3 files changed, 20 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index dfaf2f7f1d3..66711aa1804 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -26,6 +26,10 @@ body {
 
 .container-limited {
   max-width: $fixed-layout-width;
+
+  &.limit-container-width {
+    max-width: $limited-layout-width;
+  }
 }
 
 
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 18716813c48..55d97b9219c 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -166,6 +166,9 @@ $row-hover-border: #b2d7ff;
 $progress-color: #c0392b;
 $header-height: 50px;
 $fixed-layout-width: 1280px;
+$limited-layout-width: 958px;
+$line-length-width: 700px;
+$gl-avatar-size: 40px;
 $error-exclamation-point: #e62958;
 $border-radius-default: 2px;
 $btn-transparent-color: #8f8f8f;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 90587b9425b..6c35496b846 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -1,3 +1,16 @@
+.container-limited.limit-container-width {
+  .issue-details {
+    .description,
+    .note-body {
+      p,
+      ul,
+      ol,
+      .code {
+        max-width: $line-length-width;
+      }
+    }
+  }
+}
 .issuable-details {
   section {
     .issuable-discussion {
-- 
cgit v1.2.1


From 258ab29435d4a02ab5ded6c19de597fdf847ef80 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 2 Dec 2016 10:13:04 -0600
Subject: Add content_class for limited width

---
 app/assets/stylesheets/pages/issuable.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 6c35496b846..2357dd2fe6f 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -11,6 +11,7 @@
     }
   }
 }
+
 .issuable-details {
   section {
     .issuable-discussion {
-- 
cgit v1.2.1


From a2a16503a8ecfe1b38f6ef8e31c96b53537dfe02 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 12 Dec 2016 12:12:37 +0000
Subject: Fix vertical alignment of action icon with status icon

---
 app/assets/stylesheets/pages/pipelines.scss | 42 +++++++++++++----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 304a7932a06..75b127eb7f6 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -654,6 +654,7 @@
 
         i {
           font-size: 11px;
+          margin-top: 0;
         }
       }
 
@@ -672,33 +673,26 @@
 }
 
 // Action Icons
-.ci-action-icon-container {
-  padding: 0;
+.ci-action-icon-container .ci-action-icon-wrapper {
+  float: right;
+  margin-top: -1px;
 
-  .ci-action-icon-wrapper {
-    display: inline-block;
-    float: right;
-
-    i {
-      color: $stage-badge-text;
-      border-radius: 100%;
-      border: 1px solid $stage-badge-text;
-      text-align: center;
-      display: table-cell;
-      vertical-align: middle;
-      padding: 5px;
-      font-size: 13px;
-      background: $white-light;
+  i {
+    color: $stage-badge-text;
+    border-radius: 100%;
+    border: 1px solid $stage-badge-text;
+    padding: 5px 6px;
+    font-size: 13px;
+    background: $white-light;
 
-      &:hover {
-        color: $gl-text-color;
-        background-color: $stage-hover-bg;
-        border: 1px solid $stage-hover-bg;
-      }
+    &:hover {
+      color: $gl-text-color;
+      background-color: $stage-hover-bg;
+      border: 1px solid $stage-hover-bg;
     }
+  }
 
-    .ci-play-icon {
-      padding: 5px 4px 5px 7px;
-    }
+  .ci-play-icon {
+    padding: 5px 5px 5px 7px;
   }
 }
-- 
cgit v1.2.1


From 1de2edc1f14a805afa23c6fde79bdd499af75f33 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 12 Dec 2016 21:09:17 +0000
Subject: Fix pipeline stroke position

---
 app/assets/stylesheets/pages/pipelines.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 75b127eb7f6..4a5b0b5922c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -427,7 +427,7 @@
         width: 21px;
         height: 25px;
         position: absolute;
-        top: -31px;
+        top: -30px;
         border-top: 2px solid $border-color;
       }
 
-- 
cgit v1.2.1


From 92b0f54ea222ce4c4437a50683c972bacc1fee06 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 13 Dec 2016 11:39:13 +0000
Subject: Fix graph stroke position

---
 app/assets/stylesheets/pages/pipelines.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 4a5b0b5922c..15da30dda2b 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -427,7 +427,7 @@
         width: 21px;
         height: 25px;
         position: absolute;
-        top: -30px;
+        top: -32px;
         border-top: 2px solid $border-color;
       }
 
-- 
cgit v1.2.1


From 5b1a38564efdba1850d7195b01146c6b49ffb29a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 14:19:18 +0000
Subject: Fix scss error

---
 app/assets/stylesheets/pages/pipelines.scss | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 23312259f73..26487b2acf9 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -665,14 +665,15 @@
         color: $gl-text-color;
       }
 
-    .stage {
-      max-width: 100px;
-      width: 100px;
-    }
+      .stage {
+        max-width: 100px;
+        width: 100px;
+      }
 
-    .ci-status-icon svg {
-      height: 18px;
-      width: 18px;
+      .ci-status-icon svg {
+        height: 18px;
+        width: 18px;
+      }
     }
   }
 }
-- 
cgit v1.2.1


From a0ba72ee28ff666e651d3a9cdef19a9d35c22616 Mon Sep 17 00:00:00 2001
From: Dimitrie Hoekstra <dimitriehoekstra@gmail.com>
Date: Wed, 14 Dec 2016 17:53:39 +0100
Subject: css changes @dimitrieh v1

---
 app/assets/stylesheets/framework/dropdowns.scss |  2 +-
 app/assets/stylesheets/framework/variables.scss |  2 +-
 app/assets/stylesheets/pages/pipelines.scss     | 27 ++++++++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index d5914b900e2..21df80c01f7 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -98,7 +98,7 @@
   @extend .dropdown-toggle;
   padding-right: 20px;
   position: relative;
-  width: 160px;
+  width: 163px;
   text-overflow: ellipsis;
   overflow: hidden;
 
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 03fbfa5f1bd..3ed19672ec1 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -578,4 +578,4 @@ Pipeline Graph
 */
 $stage-hover-bg: #eaf3fc;
 $stage-hover-border: #d1e7fc;
-$stage-badge-text: #d4d4d4;
+$stage-badge-text: #e5e5e5;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 26487b2acf9..ac18c39dfc4 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -460,7 +460,7 @@
     border-radius: 30px;
     background-color: $white-light;
     position: relative;
-    padding: 8px 10px 9px;
+    padding: 8px 4px 9px 10px;
     width: 186px;
     margin-bottom: 10px;
 
@@ -605,7 +605,7 @@
     float: right;
     color: $stage-badge-text;
     font-weight: 100;
-    font-size: 13px;
+    font-size: 15px;
     margin-top: 1px;
     margin-right: 2px;
   }
@@ -629,6 +629,7 @@
     ul {
       max-height: 245px;
       overflow: auto;
+      margin: 5px 0;
 
       li {
         padding-top: 2px;
@@ -665,6 +666,18 @@
         color: $gl-text-color;
       }
 
+      .ci-action-icon-container {
+        i {
+          width: 25px;
+          height: 25px;
+
+          &:before{
+            top: 1px;
+            left: 1px;
+          }
+        }
+      }
+
       .stage {
         max-width: 100px;
         width: 100px;
@@ -681,7 +694,7 @@
 // Action Icons
 .ci-action-icon-container .ci-action-icon-wrapper {
   float: right;
-  margin-top: -1px;
+  margin-top: -4px;
 
   i {
     color: $stage-badge-text;
@@ -690,6 +703,14 @@
     padding: 5px 6px;
     font-size: 13px;
     background: $white-light;
+    height: 30px;
+    width: 30px;
+
+    &:before {
+      position: relative;
+      top: 3px;
+      left: 3px;
+    }
 
     &:hover {
       color: $gl-text-color;
-- 
cgit v1.2.1


From acc4b73cb5e3edfed1fa25d461d36b82fe2aacb2 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 17:31:43 +0000
Subject: Remove duplicate color variable

---
 app/assets/stylesheets/framework/variables.scss |  1 -
 app/assets/stylesheets/pages/pipelines.scss     | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 3ed19672ec1..710b971615b 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -578,4 +578,3 @@ Pipeline Graph
 */
 $stage-hover-bg: #eaf3fc;
 $stage-hover-border: #d1e7fc;
-$stage-badge-text: #e5e5e5;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ac18c39dfc4..0124940408a 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -603,10 +603,9 @@
 
   .dropdown-counter-badge {
     float: right;
-    color: $stage-badge-text;
+    color: $border-color;
     font-weight: 100;
     font-size: 15px;
-    margin-top: 1px;
     margin-right: 2px;
   }
 
@@ -687,6 +686,10 @@
         height: 18px;
         width: 18px;
       }
+
+      .ci-status-text {
+        max-width: 95px;
+      }
     }
   }
 }
@@ -697,9 +700,9 @@
   margin-top: -4px;
 
   i {
-    color: $stage-badge-text;
+    color: $border-color;
     border-radius: 100%;
-    border: 1px solid $stage-badge-text;
+    border: 1px solid $border-color;
     padding: 5px 6px;
     font-size: 13px;
     background: $white-light;
-- 
cgit v1.2.1


From bdae2df31065365283720c1e29d9e5e5d495bcf3 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 23:27:26 +0000
Subject: Fix firefox bug

---
 app/assets/stylesheets/pages/pipelines.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 0124940408a..ee08d9d3ca0 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -463,6 +463,7 @@
     padding: 8px 4px 9px 10px;
     width: 186px;
     margin-bottom: 10px;
+    white-space: normal;
 
     &:hover {
       background-color: $stage-hover-bg;
@@ -586,7 +587,7 @@
     border: none;
     padding: 0;
     color: $gl-text-color-light;
-    flex-grow: 1;
+    white-space: normal;
 
     &:focus {
       outline: none;
@@ -603,6 +604,7 @@
 
   .dropdown-counter-badge {
     float: right;
+    clear: right;
     color: $border-color;
     font-weight: 100;
     font-size: 15px;
@@ -651,7 +653,10 @@
         padding: 0;
         font-size: 11px;
         float: right;
-        margin-top: 5px;
+        clear: right;
+        margin-top: 3px;
+        display: inline-block;
+        position: relative;
 
         i {
           font-size: 11px;
-- 
cgit v1.2.1


From 63e5e009b3fb7c85a8471d2e15951bd5d04870b5 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 23:33:25 +0000
Subject: Changes after review

---
 app/assets/stylesheets/pages/pipelines.scss | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ee08d9d3ca0..e879c2495fb 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -484,6 +484,10 @@
       }
     }
 
+    .ci-status-icon {
+      position: relative;
+      top: 1px;
+    }
     .ci-status-icon svg {
       height: 20px;
       width: 20px;
@@ -588,6 +592,7 @@
     padding: 0;
     color: $gl-text-color-light;
     white-space: normal;
+    overflow: visible;
 
     &:focus {
       outline: none;
-- 
cgit v1.2.1


From 4564492a84b91b820ef0bcc69a84563ebeed9cb2 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 00:04:22 +0000
Subject: Fix dropdown hover

---
 app/assets/stylesheets/pages/pipelines.scss | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index e879c2495fb..4569b91383f 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -488,6 +488,7 @@
       position: relative;
       top: 1px;
     }
+
     .ci-status-icon svg {
       height: 20px;
       width: 20px;
@@ -638,8 +639,11 @@
       margin: 5px 0;
 
       li {
-        padding-top: 2px;
         margin: 0 5px;
+        padding-left: 0;
+        padding-bottom: 0;
+        margin-bottom: 0;
+        line-height: 1.2;
       }
 
       li:first-child {
@@ -658,8 +662,7 @@
         padding: 0;
         font-size: 11px;
         float: right;
-        clear: right;
-        margin-top: 3px;
+        margin-top: 4px;
         display: inline-block;
         position: relative;
 
@@ -699,6 +702,9 @@
 
       .ci-status-text {
         max-width: 95px;
+        padding-bottom: 3px;
+        position: relative;
+        top: 3px;
       }
     }
   }
-- 
cgit v1.2.1


From 48fed57b05b0394ca824bed90c670505b3a8a273 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 10:55:34 +0000
Subject: Fix scss linter error

---
 app/assets/stylesheets/pages/pipelines.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 4569b91383f..3054f0655db 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -683,7 +683,7 @@
           width: 25px;
           height: 25px;
 
-          &:before{
+          &::before {
             top: 1px;
             left: 1px;
           }
@@ -725,7 +725,7 @@
     height: 30px;
     width: 30px;
 
-    &:before {
+    &::before {
       position: relative;
       top: 3px;
       left: 3px;
-- 
cgit v1.2.1


From 4ae28cb31d9f0915aac647e1befa61067b6932f1 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 17:30:49 +0000
Subject: Changes after review

---
 app/assets/stylesheets/pages/pipelines.scss | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index d3f39570f11..be22e7bdc79 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -645,14 +645,6 @@
         margin-bottom: 0;
         line-height: 1.2;
       }
-
-      li:first-child {
-        padding-top: 6px;
-      }
-
-      li:last-child {
-        padding-bottom: 6px;
-      }
     }
 
     .dropdown-build {
@@ -741,4 +733,4 @@
   .ci-play-icon {
     padding: 5px 5px 5px 7px;
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 24d2e662d4251ed8c73a57319576af6de3d488a1 Mon Sep 17 00:00:00 2001
From: tauriedavis <taurie@gitlab.com>
Date: Fri, 2 Dec 2016 12:38:04 -0800
Subject: Limit description container for mrs while viewing side by side diff

---
 app/assets/stylesheets/framework/variables.scss |  3 +-
 app/assets/stylesheets/pages/issuable.scss      | 52 ++++++++++++++++++++-----
 app/assets/stylesheets/pages/notes.scss         |  4 --
 3 files changed, 43 insertions(+), 16 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 55d97b9219c..13abe6033b2 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -166,8 +166,7 @@ $row-hover-border: #b2d7ff;
 $progress-color: #c0392b;
 $header-height: 50px;
 $fixed-layout-width: 1280px;
-$limited-layout-width: 958px;
-$line-length-width: 700px;
+$limited-layout-width: 990px;
 $gl-avatar-size: 40px;
 $error-exclamation-point: #e62958;
 $border-radius-default: 2px;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 2357dd2fe6f..0b15a72e6b4 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -1,15 +1,48 @@
-.container-limited.limit-container-width {
-  .issue-details {
-    .description,
-    .note-body {
-      p,
-      ul,
-      ol,
-      .code {
-        max-width: $line-length-width;
+// Limit MR description for side-by-side diff view
+.limit-container-width {
+  .detail-page-header {
+    max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2));
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  .issuable-details {
+    .detail-page-description,
+    .mr-source-target,
+    .mr-state-widget,
+    .merge-manually {
+      max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2));
+      margin-left: auto;
+      margin-right: auto;
+    }
+
+    .merge-request-tabs-holder {
+      &.affix {
+        border-bottom: 1px solid $border-color;
+
+        .nav-links {
+          border: 0;
+        }
+      }
+
+      .container-fluid {
+        padding-left: 0;
+        padding-right: 0;
+        max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2));
+        margin-left: auto;
+        margin-right: auto;
       }
     }
   }
+
+  .diffs {
+    .mr-version-controls,
+    .files-changed {
+      max-width: calc(#{$limited-layout-width} - (#{$gl-padding} * 2));
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
 }
 
 .issuable-details {
@@ -23,7 +56,6 @@
   .description img:not(.emoji) {
     border: 1px solid $table-border-gray;
     padding: 5px;
-    margin: 5px;
     max-height: calc(100vh - 100px);
   }
 }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 10eb3d4203e..d697c8d25df 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -383,10 +383,6 @@ ul.notes {
   .note-action-button {
     margin-left: 10px;
   }
-
-  @media (min-width: $screen-sm-min) {
-    position: relative;
-  }
 }
 
 .discussion-actions {
-- 
cgit v1.2.1


From 01876eccad2bbc9ea2f35cb27c41b7373b20f26b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 13:54:23 +0000
Subject: Initial commit

---
 app/assets/stylesheets/framework/icons.scss | 24 ++++++++++++++++++++++++
 app/assets/stylesheets/pages/pipelines.scss | 26 ++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index 226bd2ead31..88b391ef2df 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -4,6 +4,10 @@
   svg {
     fill: $gl-success;
   }
+
+  .builds-dropdown-caret {
+    color: $gl-success;
+  }
 }
 
 .ci-status-icon-failed {
@@ -12,6 +16,10 @@
   svg {
     fill: $gl-danger;
   }
+
+  .builds-dropdown-caret {
+    color: $gl-danger;
+  }
 }
 
 .ci-status-icon-pending,
@@ -21,6 +29,10 @@
   svg {
     fill: $gl-warning;
   }
+
+  .builds-dropdown-caret {
+    color: $gl-warning;
+  }
 }
 
 .ci-status-icon-running {
@@ -29,6 +41,10 @@
   svg {
     fill: $blue-normal;
   }
+
+  .builds-dropdown-caret {
+    color: $blue-normal;
+  }
 }
 
 .ci-status-icon-canceled,
@@ -39,6 +55,10 @@
   svg {
     fill: $gl-gray;
   }
+
+  .builds-dropdown-caret {
+    color: $gl-gray;
+  }
 }
 
 .ci-status-icon-created,
@@ -48,4 +68,8 @@
   svg {
     fill: $gray-darkest;
   }
+
+  .builds-dropdown-caret {
+    color: $gray-darkest;
+  }
 }
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index be22e7bdc79..50e8165a017 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -734,3 +734,29 @@
     padding: 5px 5px 5px 7px;
   }
 }
+
+/**
+ * Builds dropdown in mini pipeline
+ */
+.builds-dropdown {
+  border: none;
+  background: transparent;
+  padding: 0;
+  font-size: inherit;
+  border-radius: 0;
+  cursor: pointer;
+
+  .dropdown-caret {
+    display: none;
+    position: absolute;
+    top: 3px;
+    right: 6px;
+    font-size: 10px;
+  }
+
+  &:hover {
+    .dropdown-caret {
+      display: block;
+    }
+  }
+}
-- 
cgit v1.2.1


From 708125853117916ce3eeb809e5bb7518c8e5e3d8 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 18:34:56 +0000
Subject: Dropdown with arrow

---
 app/assets/stylesheets/pages/pipelines.scss | 256 ++++++++++++++++------------
 1 file changed, 145 insertions(+), 111 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 50e8165a017..df88e7b5925 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -576,17 +576,14 @@
     }
   }
 
-  .ci-status-text {
-    max-width: 110px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: bottom;
-    display: inline-block;
-    position: relative;
-    font-weight: 100;
+  // Position in the pipeline graph
+  .grouped-pipeline-dropdown {
+    right: -206px;
+    top: -11px;
   }
+}
 
+<<<<<<< HEAD
   .dropdown-menu-toggle {
     background-color: transparent;
     border: none;
@@ -594,110 +591,81 @@
     color: $gl-text-color-light;
     white-space: normal;
     overflow: visible;
+=======
+.dropdown-counter-badge {
+  float: right;
+  color: $border-color;
+  font-weight: 100;
+  font-size: 15px;
+  margin-right: 2px;
+}
+>>>>>>> 5ba6f0d... Dropdown with arrow
 
-    &:focus {
-      outline: none;
-    }
+.grouped-pipeline-dropdown {
+  padding: 0;
+  width: 191px;
+  left: auto;
+  right: -206px;
+  top: -11px;
+  box-shadow: 0 1px 5px $black-transparent;
 
-    &:hover {
-      color: $gl-text-color;
+  a {
+    display: inline-block;
 
-      .dropdown-counter-badge {
-        color: $gl-text-color;
-      }
+    &:hover {
+      background-color: $stage-hover-bg;
     }
   }
 
-  .dropdown-counter-badge {
-    float: right;
-    clear: right;
-    color: $border-color;
-    font-weight: 100;
-    font-size: 15px;
-    margin-right: 2px;
-  }
-
-  .grouped-pipeline-dropdown {
-    padding: 0;
-    width: 191px;
-    left: auto;
-    right: -206px;
-    top: -11px;
-    box-shadow: 0 1px 5px $black-transparent;
-
-    a {
-      display: inline-block;
+  ul {
+    max-height: 245px;
+    overflow: auto;
+    margin: 5px 0;
 
-      &:hover {
-        background-color: $stage-hover-bg;
-      }
+    li {
+      padding-top: 2px;
+      margin: 0 5px;
     }
 
-    ul {
-      max-height: 245px;
-      overflow: auto;
-      margin: 5px 0;
-
-      li {
-        margin: 0 5px;
-        padding-left: 0;
-        padding-bottom: 0;
-        margin-bottom: 0;
-        line-height: 1.2;
-      }
+    li:first-child {
+      padding-top: 6px;
     }
 
-    .dropdown-build {
-      color: $gl-text-color-light;
-
-      a.ci-action-icon-container {
-        padding: 0;
-        font-size: 11px;
-        float: right;
-        margin-top: 4px;
-        display: inline-block;
-        position: relative;
+    li:last-child {
+      padding-bottom: 6px;
+    }
+  }
+}
 
-        i {
-          font-size: 11px;
-          margin-top: 0;
-        }
-      }
+.ci-status-text {
+  max-width: 110px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: bottom;
+  display: inline-block;
+  position: relative;
+  font-weight: 100;
+}
 
-      &:hover {
-        background-color: $stage-hover-bg;
-        border-radius: 3px;
-        color: $gl-text-color;
-      }
 
-      .ci-action-icon-container {
-        i {
-          width: 25px;
-          height: 25px;
+.dropdown-menu-toggle {
+  background-color: transparent;
+  border: none;
+  padding: 0;
+  color: $gl-text-color-light;
+  flex-grow: 1;
 
-          &::before {
-            top: 1px;
-            left: 1px;
-          }
-        }
-      }
 
-      .stage {
-        max-width: 100px;
-        width: 100px;
-      }
+  &:focus {
+    outline: none;
+  }
 
-      .ci-status-icon svg {
-        height: 18px;
-        width: 18px;
-      }
+  &:hover {
+    color: $gl-text-color;
 
-      .ci-status-text {
-        max-width: 95px;
-        padding-bottom: 3px;
-        position: relative;
-        top: 3px;
-      }
+    .dropdown-counter-badge {
+      color: $gl-text-color;
     }
   }
 }
@@ -735,28 +703,94 @@
   }
 }
 
+.dropdown-build {
+  color: $gl-text-color-light;
+
+  a.ci-action-icon-container {
+    padding: 0;
+    font-size: 11px;
+    float: right;
+    margin-top: 5px;
+
+    i {
+      font-size: 11px;
+      margin-top: 0;
+    }
+  }
+
+  &:hover {
+    background-color: $stage-hover-bg;
+    border-radius: 3px;
+    color: $gl-text-color;
+  }
+
+  .ci-action-icon-container {
+    i {
+      width: 25px;
+      height: 25px;
+
+      &:before{
+        top: 1px;
+        left: 1px;
+      }
+    }
+  }
+
+  .stage {
+    max-width: 100px;
+    width: 100px;
+  }
+
+  .ci-status-icon svg {
+    height: 18px;
+    width: 18px;
+  }
+
+  .ci-status-text {
+    max-width: 95px;
+  }
+}
+
 /**
  * Builds dropdown in mini pipeline
  */
-.builds-dropdown {
-  border: none;
-  background: transparent;
-  padding: 0;
-  font-size: inherit;
-  border-radius: 0;
-  cursor: pointer;
+.mini-pipeline-graph {
+  .builds-dropdown {
+    background-color: transparent;
+    border: none;
+    padding: 0;
+    color: #8c8c8c;
+    flex-grow: 1;
+  }
 
-  .dropdown-caret {
-    display: none;
-    position: absolute;
-    top: 3px;
-    right: 6px;
-    font-size: 10px;
+  .grouped-pipeline-dropdown {
+    right: -172px;
+    top: 23px;
   }
 
-  &:hover {
-    .dropdown-caret {
-      display: block;
+  .arrow-up {
+    &::before,
+    &::after {
+      content: '';
+      display: inline-block;
+      position: absolute;
+      width: 0;
+      height: 0;
+      border-color: transparent;
+      border-style: solid;
+      top: -6px;
+      left: 2px;
+      border-width: 0 5px 6px 5px;
+    }
+
+    &::before {
+      border-width: 0 5px 5px 5px;
+      border-bottom-color: $border-color;
+    }
+
+    &::after {
+      margin-top: 1px;
+      border-bottom-color: $white-light;
     }
   }
 }
-- 
cgit v1.2.1


From 222eae7b7b17da923b0291c70ec2b6a4101186e6 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 18:41:21 +0000
Subject: Dropdown li style

---
 app/assets/stylesheets/pages/pipelines.scss | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index df88e7b5925..b1575d5213d 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -192,10 +192,6 @@
           border-bottom: 2px solid $border-color;
         }
       }
-
-      a {
-        display: block;
-      }
     }
   }
 
@@ -759,8 +755,7 @@
     background-color: transparent;
     border: none;
     padding: 0;
-    color: #8c8c8c;
-    flex-grow: 1;
+    color: $gl-text-color-light;
   }
 
   .grouped-pipeline-dropdown {
@@ -768,6 +763,10 @@
     top: 23px;
   }
 
+  .grouped-pipeline-dropdown a {
+    color: $gl-text-color-light;
+  }
+
   .arrow-up {
     &::before,
     &::after {
-- 
cgit v1.2.1


From 9431fcb31c22d4d9bde7366d930264cc1f5e03a6 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 14 Dec 2016 23:47:04 +0000
Subject: style dropdown

---
 app/assets/stylesheets/pages/pipelines.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index b1575d5213d..e0431e26769 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -756,6 +756,10 @@
     border: none;
     padding: 0;
     color: $gl-text-color-light;
+    border: none;
+  background: transparent;
+  padding: 0;
+  margin: 0;
   }
 
   .grouped-pipeline-dropdown {
-- 
cgit v1.2.1


From 5ce5e7a0e28062dd6b4a4195f9befe5017dd75ff Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 00:17:40 +0000
Subject: Removes duplicate declaration

---
 app/assets/stylesheets/pages/pipelines.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index e0431e26769..f98bf73756f 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -757,9 +757,7 @@
     padding: 0;
     color: $gl-text-color-light;
     border: none;
-  background: transparent;
-  padding: 0;
-  margin: 0;
+    margin: 0;
   }
 
   .grouped-pipeline-dropdown {
-- 
cgit v1.2.1


From 6fde0e094d5e2fb3edea3228ef8f7f193fc4f067 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 13:22:39 +0000
Subject: CSS: dropdown on hover

---
 app/assets/stylesheets/pages/pipelines.scss | 52 +++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index f98bf73756f..105c3fc3e7c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -22,6 +22,7 @@
 
   .table.ci-table {
     min-width: 1200px;
+    table-layout: fixed;
 
     .pipeline-id {
       color: $black;
@@ -795,3 +796,54 @@
     }
   }
 }
+
+.mini-pipeline-graph-icon-container .ci-status-icon {
+    display: inline-block;
+    border: 1px solid;
+    border-radius: 20px;
+    margin-right: 1px;
+    width: 20px;
+    height: 20px;
+    position: relative;
+
+    svg {
+      top: -1px;
+      position: relative;
+    }
+}
+
+.builds-dropdown {
+  &:focus {
+    margin-right: -6px;
+
+    .ci-status-icon {
+      width: 27px;
+      padding: 0px 6px 0px 0px;
+
+      + .dropdown-caret {
+          display: inline-block;
+      }
+    }
+  }
+
+  .mini-pipeline-graph-icon-container {
+    .ci-status-icon:hover,
+    .ci-status-icon:focus {
+      width: 27px;
+      padding: 0px 6px 0px 0px;
+
+      + .dropdown-caret {
+          display: inline-block;
+      }
+    }
+
+    .dropdown-caret {
+      font-size: 12px;
+      position: relative;
+      top: 3px;
+      left: -11px;
+      margin-right: -6px;
+      display: none;
+    }
+  }
+}
-- 
cgit v1.2.1


From e36b00e7137a7fd024ba4639ac6cb077edd2618a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 14:46:28 +0000
Subject: CSS - Adds background color. Removes unused CSS

Fix scss linter errors

Adds changelog entry

Increase icons size.
Adds transition animation

Fix jumping icon.
Reduce icon size

Fix columns width

Changes after review

Fix transition
---
 app/assets/stylesheets/framework/icons.scss |  24 ------
 app/assets/stylesheets/pages/pipelines.scss | 116 ++++++++++++++++++----------
 2 files changed, 76 insertions(+), 64 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index 88b391ef2df..226bd2ead31 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -4,10 +4,6 @@
   svg {
     fill: $gl-success;
   }
-
-  .builds-dropdown-caret {
-    color: $gl-success;
-  }
 }
 
 .ci-status-icon-failed {
@@ -16,10 +12,6 @@
   svg {
     fill: $gl-danger;
   }
-
-  .builds-dropdown-caret {
-    color: $gl-danger;
-  }
 }
 
 .ci-status-icon-pending,
@@ -29,10 +21,6 @@
   svg {
     fill: $gl-warning;
   }
-
-  .builds-dropdown-caret {
-    color: $gl-warning;
-  }
 }
 
 .ci-status-icon-running {
@@ -41,10 +29,6 @@
   svg {
     fill: $blue-normal;
   }
-
-  .builds-dropdown-caret {
-    color: $blue-normal;
-  }
 }
 
 .ci-status-icon-canceled,
@@ -55,10 +39,6 @@
   svg {
     fill: $gl-gray;
   }
-
-  .builds-dropdown-caret {
-    color: $gl-gray;
-  }
 }
 
 .ci-status-icon-created,
@@ -68,8 +48,4 @@
   svg {
     fill: $gray-darkest;
   }
-
-  .builds-dropdown-caret {
-    color: $gray-darkest;
-  }
 }
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 105c3fc3e7c..33d3a800e7c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -28,12 +28,16 @@
       color: $black;
     }
 
-    .branch-commit {
-      width: 30%;
+    .pipeline-date,
+    .pipeline-status {
+      width: 10%;
+    }
 
-      .branch-name {
-        max-width: 195px;
-      }
+    .pipeline-info,
+    .pipeline-commit,
+    .pipeline-actions,
+    .pipeline-stages {
+      width: 20%;
     }
   }
 }
@@ -107,7 +111,7 @@
 
     .branch-name {
       font-weight: bold;
-      max-width: 150px;
+      max-width: 120px;
       overflow: hidden;
       display: inline-block;
       white-space: nowrap;
@@ -133,7 +137,7 @@
 
     .commit-title {
       margin-top: 4px;
-      max-width: 300px;
+      max-width: 225px;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -580,15 +584,6 @@
   }
 }
 
-<<<<<<< HEAD
-  .dropdown-menu-toggle {
-    background-color: transparent;
-    border: none;
-    padding: 0;
-    color: $gl-text-color-light;
-    white-space: normal;
-    overflow: visible;
-=======
 .dropdown-counter-badge {
   float: right;
   color: $border-color;
@@ -596,7 +591,6 @@
   font-size: 15px;
   margin-right: 2px;
 }
->>>>>>> 5ba6f0d... Dropdown with arrow
 
 .grouped-pipeline-dropdown {
   padding: 0;
@@ -707,7 +701,9 @@
     padding: 0;
     font-size: 11px;
     float: right;
-    margin-top: 5px;
+    margin-top: 4px;
+    display: inline-block;
+    position: relative;
 
     i {
       font-size: 11px;
@@ -726,7 +722,7 @@
       width: 25px;
       height: 25px;
 
-      &:before{
+      &::before {
         top: 1px;
         left: 1px;
       }
@@ -782,11 +778,11 @@
       border-style: solid;
       top: -6px;
       left: 2px;
-      border-width: 0 5px 6px 5px;
+      border-width: 0 5px 6px;
     }
 
     &::before {
-      border-width: 0 5px 5px 5px;
+      border-width: 0 5px 5px;
       border-bottom-color: $border-color;
     }
 
@@ -797,53 +793,93 @@
   }
 }
 
+/**
+ * Icons in mini pipeline graph
+ */
 .mini-pipeline-graph-icon-container .ci-status-icon {
-    display: inline-block;
-    border: 1px solid;
-    border-radius: 20px;
-    margin-right: 1px;
-    width: 20px;
-    height: 20px;
-    position: relative;
+  display: inline-block;
+  border: 1px solid;
+  border-radius: 20px;
+  margin-right: 1px;
+  width: 20px;
+  height: 20px;
+  position: relative;
+  z-index: 2;
+  transition: all 0.2s cubic-bezier(0.25, 0, 1, 1);
 
-    svg {
-      top: -1px;
-      position: relative;
-    }
+  svg {
+    top: -1px;
+  }
 }
 
 .builds-dropdown {
   &:focus {
-    margin-right: -6px;
+    outline: none;
+    margin-right: -8px;
 
     .ci-status-icon {
-      width: 27px;
-      padding: 0px 6px 0px 0px;
+      width: 28px;
+      padding: 0 8px 0 0;
+      transition: all 0.2s cubic-bezier(0.25, 0, 1, 1);
 
       + .dropdown-caret {
-          display: inline-block;
+        display: inline-block;
       }
     }
   }
 
+  &:focus,
+  &:active {
+    .ci-status-icon-success {
+      background-color: rgba($gl-success, .1);
+    }
+
+    .ci-status-icon-failed {
+      background-color: rgba($gl-danger, .1);
+    }
+
+    .ci-status-icon-pending,
+    .ci-status-icon-success_with_warnings {
+      background-color: rgba($gl-warning, .1);
+    }
+
+    .ci-status-icon-running {
+      background-color: rgba($blue-normal, .1);
+    }
+
+    .ci-status-icon-canceled,
+    .ci-status-icon-disabled,
+    .ci-status-icon-not-found {
+      background-color: rgba($gl-gray, .1);
+    }
+
+    .ci-status-icon-created,
+    .ci-status-icon-skipped {
+      background-color: rgba($gray-darkest, .1);
+    }
+
+  }
+
   .mini-pipeline-graph-icon-container {
     .ci-status-icon:hover,
     .ci-status-icon:focus {
-      width: 27px;
-      padding: 0px 6px 0px 0px;
+      width: 28px;
+      padding: 0 8px 0 0;
+      transition: all 0.2s cubic-bezier(0.25, 0, 1, 1);
 
       + .dropdown-caret {
-          display: inline-block;
+        display: inline-block;
       }
     }
 
     .dropdown-caret {
-      font-size: 12px;
+      font-size: 11px;
       position: relative;
       top: 3px;
       left: -11px;
       margin-right: -6px;
       display: none;
+      z-index: 2;
     }
   }
 }
-- 
cgit v1.2.1


From e42de89a15c858866d78a4d2a5837a0feec922a5 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 17:30:49 +0000
Subject: Changes after review

Changes after review

Fix tooltip title

Remove unneeded string interpolation
---
 app/assets/stylesheets/pages/pipelines.scss | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index d3f39570f11..be22e7bdc79 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -645,14 +645,6 @@
         margin-bottom: 0;
         line-height: 1.2;
       }
-
-      li:first-child {
-        padding-top: 6px;
-      }
-
-      li:last-child {
-        padding-bottom: 6px;
-      }
     }
 
     .dropdown-build {
@@ -741,4 +733,4 @@
   .ci-play-icon {
     padding: 5px 5px 5px 7px;
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 6c809dfae84e702f7a49d3fac5725745264e0ff9 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 22 Nov 2016 14:27:31 +0530
Subject: Allow creating personal access tokens / OAuth applications with
 scopes.

---
 app/assets/stylesheets/pages/profile.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 8a5b0e20a86..8b1976bd925 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -262,3 +262,13 @@ table.u2f-registrations {
     border-right: solid 1px transparent;
   }
 }
+
+.oauth-application-show {
+  .scope-name {
+    font-weight: 600;
+  }
+
+  .scopes-list {
+    padding-left: 18px;
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 2490f804cd4c12533fd6c70fc8014a06f2d19d47 Mon Sep 17 00:00:00 2001
From: Dimitrie Hoekstra <dimitriehoekstra@gmail.com>
Date: Fri, 16 Dec 2016 11:59:10 +0100
Subject: Additional rounded label fixes

---
 app/assets/stylesheets/framework/variables.scss | 2 +-
 app/assets/stylesheets/pages/labels.scss        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 936aaf38254..d201a538195 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -436,7 +436,7 @@ $jq-ui-default-color: #777;
 $label-gray-bg: #f8fafc;
 $label-inverse-bg: #333;
 $label-remove-border: rgba(0, 0, 0, .1);
-$label-border-radius: 14px;
+$label-border-radius: 100px;
 
 /*
 * Lint
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 25c91203ff4..703a429d63c 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -98,7 +98,7 @@
   }
 
   .label {
-    padding: 9px;
+    padding: 8px 9px 9px 9px;
     font-size: 14px;
   }
 }
@@ -201,6 +201,8 @@
   .label-remove {
     border-left: 1px solid $label-remove-border;
     z-index: 3;
+    border-radius: $label-border-radius;
+    padding: 6px 10px 6px 9px;
   }
 
   .btn {
-- 
cgit v1.2.1


From 595da33d738041cf0b2c28a87989aa271f5019cc Mon Sep 17 00:00:00 2001
From: Dimitrie Hoekstra <dimitriehoekstra@gmail.com>
Date: Fri, 16 Dec 2016 13:05:44 +0100
Subject: fixed scss linting issue

---
 app/assets/stylesheets/pages/labels.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 703a429d63c..d129eb12a45 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -98,7 +98,7 @@
   }
 
   .label {
-    padding: 8px 9px 9px 9px;
+    padding: 8px 9px 9px;
     font-size: 14px;
   }
 }
-- 
cgit v1.2.1


From df6c1b84a842d6dc54b27e396b60ffd4d7723c4a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 16 Dec 2016 12:29:58 +0000
Subject: Prevent enviroment table to overflow when name has underscores

Fix error in linter

Add changelog entry
---
 app/assets/stylesheets/pages/environments.scss | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 92dd9885ab8..3d60426de01 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -30,19 +30,25 @@
     display: table-cell;
   }
 
+  .environments-name,
   .environments-commit,
   .environments-actions {
     width: 20%;
   }
 
-  .environments-deploy,
-  .environments-build,
   .environments-date {
     width: 10%;
   }
 
-  .environments-name {
-    width: 30%;
+  .environments-deploy,
+  .environments-build {
+    width: 15%;
+  }
+
+  .environment-name,
+  .environments-build-cell,
+  .deployment-column {
+    word-break: break-all;
   }
 
   .deployment-column {
-- 
cgit v1.2.1


From c46b758b48400efff5241efafad94c2ddbb8224c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 16 Dec 2016 17:56:27 +0000
Subject: Remove unused style for dropdown. Improves animation

---
 app/assets/stylesheets/pages/pipelines.scss | 48 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 25 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index a0719b415e5..b3deac3ab75 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -466,6 +466,28 @@
     margin-bottom: 10px;
     white-space: normal;
 
+
+    .dropdown-menu-toggle {
+      background-color: transparent;
+      border: none;
+      padding: 0;
+      color: $gl-text-color-light;
+      flex-grow: 1;
+
+
+      &:focus {
+        outline: none;
+      }
+
+      &:hover {
+        color: $gl-text-color;
+
+        .dropdown-counter-badge {
+          color: $gl-text-color;
+        }
+      }
+    }
+
     &:hover {
       background-color: $stage-hover-bg;
       border: 1px solid $stage-hover-border;
@@ -635,28 +657,6 @@
   font-weight: 100;
 }
 
-
-.dropdown-menu-toggle {
-  background-color: transparent;
-  border: none;
-  padding: 0;
-  color: $gl-text-color-light;
-  flex-grow: 1;
-
-
-  &:focus {
-    outline: none;
-  }
-
-  &:hover {
-    color: $gl-text-color;
-
-    .dropdown-counter-badge {
-      color: $gl-text-color;
-    }
-  }
-}
-
 // Action Icons
 .ci-action-icon-container .ci-action-icon-wrapper {
   float: right;
@@ -816,7 +816,7 @@
     .ci-status-icon {
       width: 28px;
       padding: 0 8px 0 0;
-      transition: all 0.2s cubic-bezier(0.25, 0, 1, 1);
+      transition: width 0.2s cubic-bezier(0.25, 0, 1, 1);
 
       + .dropdown-caret {
         display: inline-block;
@@ -853,7 +853,6 @@
     .ci-status-icon-skipped {
       background-color: rgba($gray-darkest, .1);
     }
-
   }
 
   .mini-pipeline-graph-icon-container {
@@ -861,7 +860,6 @@
     .ci-status-icon:focus {
       width: 28px;
       padding: 0 8px 0 0;
-      transition: all 0.2s cubic-bezier(0.25, 0, 1, 1);
 
       + .dropdown-caret {
         display: inline-block;
-- 
cgit v1.2.1


From 88e364f0f6f8d21b73f9eea786c7f8326dff61fe Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 16 Dec 2016 12:56:38 -0600
Subject: Put back bootstrap wells

---
 app/assets/stylesheets/framework/tw_bootstrap.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index d998d654aa4..718dbbfea27 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -35,7 +35,7 @@
 @import "bootstrap/alerts";
 // @import "bootstrap/progress-bars";
 @import "bootstrap/list-group";
-// @import "bootstrap/wells";
+@import "bootstrap/wells";
 @import "bootstrap/close";
 @import "bootstrap/panels";
 
-- 
cgit v1.2.1


From cce41cb2a6574de609211e4e2284f684e2d236d8 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 18:08:11 +0000
Subject: Adds CSS

---
 app/assets/stylesheets/framework/icons.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index 226bd2ead31..b37847e3d96 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -49,3 +49,11 @@
     fill: $gray-darkest;
   }
 }
+
+.ci-status-icon-manual {
+  color: $gl-text-color;
+
+  svg {
+    fill: $gray-darkest;
+  }
+}
-- 
cgit v1.2.1


From d58fffb27766f49b82866c5460fe218854f9596e Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 16 Dec 2016 14:30:28 -0600
Subject: fix margin on alert stripes within ":flash_message" block

---
 app/assets/stylesheets/framework/layout.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 66711aa1804..bef24162924 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -32,6 +32,14 @@ body {
   }
 }
 
+.alert-wrapper {
+  margin-bottom: $gl-padding;
+
+  .alert {
+    margin-bottom: 0;
+  }
+}
+
 
 /* The following prevents side effects related to iOS Safari's implementation of -webkit-overflow-scrolling: touch,
 which is applied to the body by jquery.nicescroling plugin to force hardware acceleration for momentum scrolling. Side
-- 
cgit v1.2.1


From dc9b0913670dc8de5e01a40fd28fa44f48defc9e Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 16 Dec 2016 14:38:01 -0600
Subject: stripe colors for successive alert-warning blocks

---
 app/assets/stylesheets/framework/layout.scss    | 27 +++++++++++++++++++++++++
 app/assets/stylesheets/framework/variables.scss |  1 -
 app/assets/stylesheets/pages/projects.scss      |  6 ------
 3 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index bef24162924..59fae61a44f 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -38,6 +38,33 @@ body {
   .alert {
     margin-bottom: 0;
   }
+
+  /* Stripe the background colors so that adjacent alert-warnings are distinct from one another */
+  .alert-warning {
+    transition: background-color 0.15s, border-color 0.15s;
+    background-color: lighten($gl-warning, 4%);
+    border-color: lighten($gl-warning, 4%);
+  }
+
+  .alert-warning + .alert-warning {
+    background-color: $gl-warning;
+    border-color: $gl-warning;
+  }
+
+  .alert-warning + .alert-warning + .alert-warning {
+    background-color: darken($gl-warning, 4%);
+    border-color: darken($gl-warning, 4%);
+  }
+
+  .alert-warning + .alert-warning + .alert-warning + .alert-warning {
+    background-color: darken($gl-warning, 8%);
+    border-color: darken($gl-warning, 8%);
+  }
+
+  .alert-warning:only-of-type {
+    background-color: $gl-warning;
+    border-color: $gl-warning;
+  }
 }
 
 
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 267fcd77b38..0b156d61a23 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -474,7 +474,6 @@ $project-option-descr-color: #54565b;
 $project-breadcrumb-color: #999;
 $project-private-forks-notice-odd: #2aa056;
 $project-network-controls-color: #888;
-$project-limit-message-bg: #f28d35;
 
 /*
 * Runners
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 9c3dbc58ae0..3b1b375133d 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -6,12 +6,6 @@
   }
 }
 
-.no-ssh-key-message,
-.project-limit-message {
-  background-color: $project-limit-message-bg;
-  margin-bottom: 0;
-}
-
 .new_project,
 .edit-project {
 
-- 
cgit v1.2.1


From 09388b2021034173156ba8958fa290b01e3a447d Mon Sep 17 00:00:00 2001
From: Nur Rony <pro.nmrony@gmail.com>
Date: Tue, 18 Oct 2016 18:22:18 +0600
Subject: Adds sort dropdown for group members

---
 app/assets/stylesheets/pages/members.scss | 54 ++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 12 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 5f3bbb40ba0..b7521133ce5 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -78,6 +78,20 @@
     float: right;
   }
 
+  .dropdown {
+    width: 100%;
+    margin-top: 5px;
+
+    .dropdown-menu-toggle {
+      width: 100%;
+    }
+
+    @media (min-width: $screen-sm-min) {
+      top: 2.4px;
+      width: 155px;
+    }
+  }
+
   .form-control {
     width: 100%;
     padding-right: 35px;
@@ -85,18 +99,34 @@
     @media (min-width: $screen-sm-min) {
       width: 350px;
     }
+
+    &.input-short {
+      @media (min-width: $screen-md-min) {
+        width: 170px;
+      }
+
+      @media (min-width: $screen-lg-min) {
+        width: 210px;
+      }
+    }
+  }
+
+  .member-search-btn {
+    position: absolute;
+    right: 4px;
+    top: 0;
+    height: 35px;
+    padding-left: 10px;
+    padding-right: 10px;
+    color: $gray-darkest;
+    background: transparent;
+    border: 0;
+    outline: 0;
+
+    @media (min-width: $screen-sm-min) {
+      right: 160px;
+      top: 8px;
+    }
   }
-}
 
-.member-search-btn {
-  position: absolute;
-  right: 0;
-  top: 0;
-  height: 35px;
-  padding-left: 10px;
-  padding-right: 10px;
-  color: $gray-darkest;
-  background: transparent;
-  border: 0;
-  outline: 0;
 }
-- 
cgit v1.2.1


From 5479fc9107507fd441de0661dd2c4c0826fb40f0 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 24 Nov 2016 11:17:51 -0200
Subject: Undo changes on members search button stylesheet

---
 app/assets/stylesheets/pages/members.scss | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index b7521133ce5..f2417efeebb 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -110,23 +110,22 @@
       }
     }
   }
+}
 
-  .member-search-btn {
-    position: absolute;
-    right: 4px;
-    top: 0;
-    height: 35px;
-    padding-left: 10px;
-    padding-right: 10px;
-    color: $gray-darkest;
-    background: transparent;
-    border: 0;
-    outline: 0;
+.member-search-btn {
+  position: absolute;
+  right: 4px;
+  top: 0;
+  height: 35px;
+  padding-left: 10px;
+  padding-right: 10px;
+  color: $gray-darkest;
+  background: transparent;
+  border: 0;
+  outline: 0;
 
-    @media (min-width: $screen-sm-min) {
-      right: 160px;
-      top: 8px;
-    }
+  @media (min-width: $screen-sm-min) {
+    right: 160px;
+    top: 8px;
   }
-
 }
-- 
cgit v1.2.1


From eac34fd9a3347b873fc963856b2f0e2104fe7a9b Mon Sep 17 00:00:00 2001
From: Nur Rony <pro.nmrony@gmail.com>
Date: Fri, 2 Dec 2016 16:24:28 +0600
Subject: Fix sort dropdown alignment

---
 app/assets/stylesheets/pages/members.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index f2417efeebb..36ee5d17211 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -83,11 +83,12 @@
     margin-top: 5px;
 
     .dropdown-menu-toggle {
+      vertical-align: middle;
       width: 100%;
     }
 
     @media (min-width: $screen-sm-min) {
-      top: 2.4px;
+      margin-top: 0;
       width: 155px;
     }
   }
@@ -126,6 +127,5 @@
 
   @media (min-width: $screen-sm-min) {
     right: 160px;
-    top: 8px;
   }
 }
-- 
cgit v1.2.1


From 27fd32613dac9c093d538e576131e7fda3f7d8e3 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 17 Dec 2016 13:46:16 +0100
Subject: Add `ci-manual` status CSS with darkest gray color

---
 app/assets/stylesheets/pages/status.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index f3b0608e545..637df7e349e 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -113,6 +113,19 @@
         fill: $gl-gray-light;
       }
     }
+
+    &.ci-manual {
+      color: $gl-gray-dark;
+      border-color: $gl-gray-dark;
+
+      &:not(span):hover {
+        background-color: rgba( $gl-gray-dark, .07);
+      }
+
+      svg {
+        fill: $gl-gray-dark;
+      }
+    }
   }
 }
 
-- 
cgit v1.2.1


From 3932c20ee61d404196022258d7b7e83c137e4519 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sat, 17 Dec 2016 13:38:18 +0000
Subject: Improve spacing and fixes manual status color

---
 app/assets/stylesheets/framework/icons.scss |  2 +-
 app/assets/stylesheets/pages/status.scss    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index b37847e3d96..8624a25c052 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -54,6 +54,6 @@
   color: $gl-text-color;
 
   svg {
-    fill: $gray-darkest;
+    fill: $gl-text-color;
   }
 }
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 637df7e349e..7ce8f7757f3 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,5 +1,6 @@
 .container-fluid {
   .ci-status {
+    display: inline-block;
     padding: 2px 7px;
     margin-right: 10px;
     border: 1px solid $gray-darker;
@@ -15,8 +16,7 @@
       height: 13px;
       width: 13px;
       position: relative;
-      top: 1px;
-      margin-right: 3px;
+      top: 2px;
       overflow: visible;
     }
 
@@ -115,15 +115,15 @@
     }
 
     &.ci-manual {
-      color: $gl-gray-dark;
-      border-color: $gl-gray-dark;
+      color: $gl-text-color;
+      border-color: $gl-text-color;
 
       &:not(span):hover {
-        background-color: rgba( $gl-gray-dark, .07);
+        background-color: rgba( $gl-text-color, .07);
       }
 
       svg {
-        fill: $gl-gray-dark;
+        fill: $gl-text-color;
       }
     }
   }
-- 
cgit v1.2.1


From 25b84b2f849d10005d214cc537ed833503d8dc89 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sat, 17 Dec 2016 14:09:38 +0000
Subject: Fix extra spacing in all rgba methods in status file

---
 app/assets/stylesheets/pages/status.scss | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 7ce8f7757f3..055dacd81f4 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -25,7 +25,7 @@
       border-color: $gl-danger;
 
       &:not(span):hover {
-        background-color: rgba( $gl-danger, .07);
+        background-color: rgba($gl-danger, .07);
       }
 
       svg {
@@ -39,7 +39,7 @@
       border-color: $gl-success;
 
       &:not(span):hover {
-        background-color: rgba( $gl-success, .07);
+        background-color: rgba($gl-success, .07);
       }
 
       svg {
@@ -52,7 +52,7 @@
       border-color: $gl-info;
 
       &:not(span):hover {
-        background-color: rgba( $gl-info, .07);
+        background-color: rgba($gl-info, .07);
       }
 
       svg {
@@ -66,7 +66,7 @@
       border-color: $gl-gray;
 
       &:not(span):hover {
-        background-color: rgba( $gl-gray, .07);
+        background-color: rgba($gl-gray, .07);
       }
 
       svg {
@@ -79,7 +79,7 @@
       border-color: $gl-warning;
 
       &:not(span):hover {
-        background-color: rgba( $gl-warning, .07);
+        background-color: rgba($gl-warning, .07);
       }
 
       svg {
@@ -92,7 +92,7 @@
       border-color: $blue-normal;
 
       &:not(span):hover {
-        background-color: rgba( $blue-normal, .07);
+        background-color: rgba($blue-normal, .07);
       }
 
       svg {
@@ -106,7 +106,7 @@
       border-color: $gl-gray-light;
 
       &:not(span):hover {
-        background-color: rgba( $gl-gray-light, .07);
+        background-color: rgba($gl-gray-light, .07);
       }
 
       svg {
@@ -119,7 +119,7 @@
       border-color: $gl-text-color;
 
       &:not(span):hover {
-        background-color: rgba( $gl-text-color, .07);
+        background-color: rgba($gl-text-color, .07);
       }
 
       svg {
-- 
cgit v1.2.1


From 8c2297f00b96cafea2adf7918086b3ef5fd049fc Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 14 Dec 2016 15:51:25 -0600
Subject: Move access request buttons to project header

---
 app/assets/stylesheets/pages/projects.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 3b1b375133d..29a8f5b3995 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -178,8 +178,10 @@
   .download-button,
   .dropdown-toggle,
   .notification-dropdown,
-  .project-dropdown {
+  .project-dropdown,
+  .access-button {
     margin-left: 10px;
+    vertical-align: top;
   }
 
   .notification-dropdown .dropdown-menu {
@@ -201,7 +203,7 @@
     display: inline-block;
 
     input {
-      height: 29px;
+      height: 28px;
     }
   }
 
@@ -255,7 +257,7 @@
       line-height: 13px;
       padding: $gl-vert-padding $gl-padding;
       letter-spacing: .4px;
-      padding: 7px 14px;
+      padding: 6px 14px;
       text-align: center;
       vertical-align: middle;
       touch-action: manipulation;
-- 
cgit v1.2.1


From 2f87703cfff38a8c88f44310031c35dbe7f017ff Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 16 Dec 2016 09:46:24 -0600
Subject: Move all project buttons to header

---
 app/assets/stylesheets/framework/mobile.scss |  2 +-
 app/assets/stylesheets/pages/projects.scss   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index abfdd7a759d..7eb9962ba33 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -54,7 +54,7 @@
     }
 
     // Display Star and Fork buttons without counters on mobile.
-    .project-action-buttons {
+    .project-repo-buttons {
       display: block;
 
       .count-buttons .btn {
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 29a8f5b3995..acfcb6c0e24 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -143,10 +143,12 @@
   margin-top: 0;
 }
 
-.project-repo-buttons,
 .group-buttons {
   margin-top: 15px;
+}
 
+.project-repo-buttons,
+.group-buttons {
   .btn {
     @include btn-gray;
     padding: 3px 10px;
@@ -175,12 +177,8 @@
     }
   }
 
-  .download-button,
-  .dropdown-toggle,
-  .notification-dropdown,
-  .project-dropdown,
-  .access-button {
-    margin-left: 10px;
+  .project-action-button {
+    margin: 15px 5px 0 5px;
     vertical-align: top;
   }
 
@@ -197,10 +195,12 @@
   .count-buttons {
     display: inline-block;
     vertical-align: top;
+    margin-top: 15px;
   }
 
   .project-clone-holder {
     display: inline-block;
+    margin: 15px 5px 0 0;
 
     input {
       height: 28px;
@@ -494,6 +494,7 @@ a.deploy-project-label {
 
 .project-stats {
   font-size: 0;
+  text-align: center;
   border-bottom: 1px solid $border-color;
 
   .nav {
-- 
cgit v1.2.1


From 78e8ac5da1fce5dab13667b9eafe7c91550e7210 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 16 Dec 2016 11:13:17 -0600
Subject: Add sentence casing, fix groups page buttons, fix dark gray variable

---
 app/assets/stylesheets/framework/variables.scss | 1 +
 app/assets/stylesheets/pages/groups.scss        | 6 ------
 app/assets/stylesheets/pages/projects.scss      | 6 +-----
 app/assets/stylesheets/pages/tree.scss          | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index d0c27d64239..460c5d995be 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -24,6 +24,7 @@ $gray-lightest: #fdfdfd;
 $gray-light: #fafafa;
 $gray-lighter: #f9f9f9;
 $gray-normal: #f5f5f5;
+$gray-dark: darken($gray-light, $darken-dark-factor);
 $gray-darker: #eee;
 $gray-darkest: #c4c4c4;
 
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index a9af7af59e2..16bff5f1e03 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -27,12 +27,6 @@
   }
 }
 
-.group-buttons {
-  .notification-dropdown {
-    display: inline-block;
-  }
-}
-
 .groups-header {
   @media (min-width: $screen-sm-min) {
     .nav-links {
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index acfcb6c0e24..a443b6a37b3 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -143,10 +143,6 @@
   margin-top: 0;
 }
 
-.group-buttons {
-  margin-top: 15px;
-}
-
 .project-repo-buttons,
 .group-buttons {
   .btn {
@@ -178,7 +174,7 @@
   }
 
   .project-action-button {
-    margin: 15px 5px 0 5px;
+    margin: 15px 5px 0;
     vertical-align: top;
   }
 
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index c0341db7289..05c0a4c29f4 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -172,7 +172,7 @@
   position: relative;
   z-index: 2;
 
-  .download-button {
+  .project-action-button {
     margin-left: $btn-side-margin;
   }
 }
-- 
cgit v1.2.1


From 3f60a276fc36fc7d1c5323c38b33fdbc774cfbbf Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Tue, 13 Dec 2016 16:53:01 +0000
Subject: Added slack slash commands frontend help well

Added tests
---
 app/assets/stylesheets/framework/forms.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 940807fc399..8726a69867b 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -96,6 +96,10 @@ label {
     code {
       line-height: 1.8;
     }
+
+    img {
+      margin-right: $gl-padding;
+    }
   }
 
   @media(max-width: $screen-xs-max) {
-- 
cgit v1.2.1


From 66ff2dede173c9918c72d381468f2d9f5b39ab86 Mon Sep 17 00:00:00 2001
From: Mitchell Hentges <mitch9654@gmail.com>
Date: Mon, 19 Dec 2016 01:34:45 -0800
Subject: Make CI badge hitboxes better match container

---
 app/assets/stylesheets/pages/pipelines.scss | 74 +++++++++++++----------------
 1 file changed, 33 insertions(+), 41 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index be22e7bdc79..243c9153ded 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -428,7 +428,7 @@
         width: 21px;
         height: 25px;
         position: absolute;
-        top: -32px;
+        top: -31px;
         border-top: 2px solid $border-color;
       }
 
@@ -456,32 +456,31 @@
   }
 
   .build {
-    border: 1px solid $border-color;
-    border-radius: 30px;
-    background-color: $white-light;
     position: relative;
-    padding: 8px 4px 9px 10px;
     width: 186px;
     margin-bottom: 10px;
     white-space: normal;
+    color: $gl-text-color-light;
 
-    &:hover {
-      background-color: $stage-hover-bg;
-      border: 1px solid $stage-hover-border;
+    > .build-content {
+      display: inline-block;
+      padding: 8px 10px 9px;
+      width: 100%;
+      border: 1px solid $border-color;
+      border-radius: 30px;
+      background-color: $white-light;
 
-      a,
-      .dropdown-counter-badge,
-      .dropdown-menu-toggle {
+      &:hover {
+        background-color: $stage-hover-bg;
+        border: 1px solid $stage-hover-border;
         color: $gl-text-color;
       }
+    }
 
-      .grouped-pipeline-dropdown a {
-        color: $gl-text-color-light;
-
-        &:hover {
-          color: $gl-text-color;
-        }
-      }
+    > .ci-action-icon-container {
+      position: absolute;
+      right: 4px;
+      top: 5px;
     }
 
     .ci-status-icon {
@@ -621,8 +620,8 @@
     padding: 0;
     width: 191px;
     left: auto;
-    right: -206px;
-    top: -11px;
+    right: -195px;
+    top: -4px;
     box-shadow: 0 1px 5px $black-transparent;
 
     a {
@@ -650,30 +649,20 @@
     .dropdown-build {
       color: $gl-text-color-light;
 
-      a.ci-action-icon-container {
-        padding: 0;
-        font-size: 11px;
-        float: right;
-        margin-top: 4px;
-        display: inline-block;
-        position: relative;
-
-        i {
-          font-size: 11px;
-          margin-top: 0;
-        }
-      }
-
-      &:hover {
-        background-color: $stage-hover-bg;
-        border-radius: 3px;
-        color: $gl-text-color;
+      .build-content {
+        width: 100%;
       }
 
       .ci-action-icon-container {
+        font-size: 11px;
+        position: absolute;
+        right: 4px;
+
         i {
           width: 25px;
           height: 25px;
+          font-size: 11px;
+          margin-top: 0;
 
           &::before {
             top: 1px;
@@ -682,6 +671,12 @@
         }
       }
 
+      &:hover {
+        background-color: $stage-hover-bg;
+        border-radius: 3px;
+        color: $gl-text-color;
+      }
+
       .stage {
         max-width: 100px;
         width: 100px;
@@ -704,9 +699,6 @@
 
 // Action Icons
 .ci-action-icon-container .ci-action-icon-wrapper {
-  float: right;
-  margin-top: -4px;
-
   i {
     color: $border-color;
     border-radius: 100%;
-- 
cgit v1.2.1


From e7c56dd1f63a0065b5930accb3ff24314430f82c Mon Sep 17 00:00:00 2001
From: Sam Rose <sam@gitlab.com>
Date: Mon, 19 Dec 2016 10:25:46 -0500
Subject: Align milestone column header with count number

---
 app/assets/stylesheets/framework/panels.scss | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss
index 5ba0486177f..9d8d08dff88 100644
--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
@@ -18,6 +18,20 @@
       margin-top: -2px;
       margin-left: 5px;
     }
+
+    &.split {
+      display: flex;
+      align-items: center;
+    }
+
+    .left {
+      flex: 1 1 auto;
+    }
+
+    .right {
+      flex: 0 0 auto;
+      text-align: right;
+    }
   }
 
   .panel-body {
-- 
cgit v1.2.1


From f347d5fcadb4b05f367ed571b27e73040f625520 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 19 Dec 2016 14:13:06 -0600
Subject: Remove inline-block styling from status

---
 app/assets/stylesheets/framework/page-header.scss | 1 -
 app/assets/stylesheets/pages/status.scss          | 1 -
 2 files changed, 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/page-header.scss b/app/assets/stylesheets/framework/page-header.scss
index fff7d7f7524..625bea96aaa 100644
--- a/app/assets/stylesheets/framework/page-header.scss
+++ b/app/assets/stylesheets/framework/page-header.scss
@@ -57,7 +57,6 @@
   }
 
   .ci-status-link {
-
     svg {
       position: relative;
       top: 2px;
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 055dacd81f4..a810ed32327 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,6 +1,5 @@
 .container-fluid {
   .ci-status {
-    display: inline-block;
     padding: 2px 7px;
     margin-right: 10px;
     border: 1px solid $gray-darker;
-- 
cgit v1.2.1


From 00f076d71b3ba831051d627271e8b0cec6f5324b Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 19 Dec 2016 14:54:07 -0600
Subject: Update font size of detail page header to 14px

---
 app/assets/stylesheets/pages/detail_page.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 80baebd5ea3..9b28df1afc5 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -2,7 +2,6 @@
   padding: $gl-padding-top 0;
   border-bottom: 1px solid $border-color;
   color: $gl-text-color-dark;
-  font-size: 16px;
   line-height: 34px;
 
   .author {
-- 
cgit v1.2.1


From d41c8f48143acf865183a324e3c18dd286d423ba Mon Sep 17 00:00:00 2001
From: Ryan Harris <harrisryan1@gmail.com>
Date: Fri, 16 Dec 2016 20:03:57 -0500
Subject: Even out padding on plus button in breadcrumb menu

Changed plus button padding to 6px 10px
---
 app/assets/stylesheets/pages/tree.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index c0341db7289..13be08104e6 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -14,6 +14,7 @@
 
   .add-to-tree {
     vertical-align: top;
+    padding: 6px 10px;
   }
 
   .tree-table {
-- 
cgit v1.2.1


From 3db5b7033b13c21b904a21f751bc0f19156ea155 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 15 Dec 2016 00:59:04 +0000
Subject: Add terminal UI and controller actions

---
 app/assets/stylesheets/framework/buttons.scss |  7 +++++++
 app/assets/stylesheets/pages/pipelines.scss   | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 59ff17ad2c1..a11f1cd7735 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -230,6 +230,13 @@
   }
 }
 
+.btn-terminal {
+  svg {
+    height: 14px;
+    width: 18px;
+  }
+}
+
 .btn-lg {
   padding: 12px 20px;
 }
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index be22e7bdc79..7905d2f2e7c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -734,3 +734,23 @@
     padding: 5px 5px 5px 7px;
   }
 }
+
+.terminal-icon {
+  margin-left: 3px;
+}
+
+.terminal-container {
+  .content-block {
+    border-bottom: none;
+  }
+
+  #terminal {
+    margin-top: 10px;
+    min-height: 450px;
+    box-sizing: border-box;
+
+    > div {
+      min-height: 450px;
+    }
+  }
+}
-- 
cgit v1.2.1


From 34e317d21ce49c122beb73d2eb695311b75d0b89 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 19 Dec 2016 17:58:46 +0000
Subject: Adds loading to improve UX

---
 app/assets/stylesheets/pages/pipelines.scss | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index b3deac3ab75..ae7b40a9416 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -753,13 +753,19 @@
     margin: 0;
   }
 
+  .builds-dropdown-loading {
+    margin: 10px auto;
+    width: 18px;
+  }
+
   .grouped-pipeline-dropdown {
     right: -172px;
     top: 23px;
-  }
+    min-height: 191px;
 
-  .grouped-pipeline-dropdown a {
-    color: $gl-text-color-light;
+    a {
+      color: $gl-text-color-light;
+    }
   }
 
   .arrow-up {
-- 
cgit v1.2.1


From 9edef45ae169e5882dab4950a8143acf7623a06d Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 19 Dec 2016 23:44:34 +0000
Subject: Resolve conflict Fix tooltips in dropdown

---
 app/assets/stylesheets/pages/pipelines.scss | 75 ++---------------------------
 1 file changed, 4 insertions(+), 71 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index bb320da619f..832d8443dc8 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -463,15 +463,11 @@
     white-space: normal;
     color: $gl-text-color-light;
 
-<<<<<<< HEAD
-
     .dropdown-menu-toggle {
       background-color: transparent;
       border: none;
       padding: 0;
       color: $gl-text-color-light;
-      flex-grow: 1;
-
 
       &:focus {
         outline: none;
@@ -486,10 +482,6 @@
       }
     }
 
-    &:hover {
-      background-color: $stage-hover-bg;
-      border: 1px solid $stage-hover-border;
-=======
     > .build-content {
       display: inline-block;
       padding: 8px 10px 9px;
@@ -497,8 +489,7 @@
       border: 1px solid $border-color;
       border-radius: 30px;
       background-color: $white-light;
->>>>>>> master
-
+      
       &:hover {
         background-color: $stage-hover-bg;
         border: 1px solid $stage-hover-border;
@@ -603,22 +594,7 @@
       }
     }
   }
-
-  // Position in the pipeline graph
-  .grouped-pipeline-dropdown {
-<<<<<<< HEAD
-    right: -206px;
-    top: -11px;
-  }
 }
-=======
-    padding: 0;
-    width: 191px;
-    left: auto;
-    right: -195px;
-    top: -4px;
-    box-shadow: 0 1px 5px $black-transparent;
->>>>>>> master
 
 .dropdown-counter-badge {
   float: right;
@@ -632,8 +608,8 @@
   padding: 0;
   width: 191px;
   left: auto;
-  right: -206px;
-  top: -11px;
+  right: -195px;
+  top: -4px;
   box-shadow: 0 1px 5px $black-transparent;
 
   a {
@@ -644,53 +620,10 @@
     }
   }
 
-<<<<<<< HEAD
   ul {
     max-height: 245px;
     overflow: auto;
     margin: 5px 0;
-=======
-    .dropdown-build {
-      color: $gl-text-color-light;
-
-      .build-content {
-        width: 100%;
-      }
-
-      .ci-action-icon-container {
-        font-size: 11px;
-        position: absolute;
-        right: 4px;
-
-        i {
-          width: 25px;
-          height: 25px;
-          font-size: 11px;
-          margin-top: 0;
-
-          &::before {
-            top: 1px;
-            left: 1px;
-          }
-        }
-      }
-
-      &:hover {
-        background-color: $stage-hover-bg;
-        border-radius: 3px;
-        color: $gl-text-color;
-      }
-
-      .stage {
-        max-width: 100px;
-        width: 100px;
-      }
-
-      .ci-status-icon svg {
-        height: 18px;
-        width: 18px;
-      }
->>>>>>> master
 
     li {
       padding-top: 2px;
@@ -747,7 +680,7 @@
 .dropdown-build {
   color: $gl-text-color-light;
 
-  a.ci-action-icon-container {
+  .ci-action-icon-container {
     padding: 0;
     font-size: 11px;
     float: right;
-- 
cgit v1.2.1


From ac86c495a3fc54be6984c4df2b363e9b4e414b4d Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 19 Dec 2016 23:45:24 +0000
Subject: Pipeline graph node was one pixel off

---
 app/assets/stylesheets/pages/pipelines.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 832d8443dc8..3639db026cf 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -489,7 +489,7 @@
       border: 1px solid $border-color;
       border-radius: 30px;
       background-color: $white-light;
-      
+
       &:hover {
         background-color: $stage-hover-bg;
         border: 1px solid $stage-hover-border;
@@ -547,7 +547,7 @@
         content: '';
         position: absolute;
         top: 48%;
-        right: -49px;
+        right: -48px;
         border-top: 2px solid $border-color;
         width: 48px;
         height: 1px;
-- 
cgit v1.2.1


From 4b9bd188433d77fbaec8ae445716de8084b6a145 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Dec 2016 13:22:31 +0000
Subject: Adds tests for the mini pipeline graph

---
 app/assets/stylesheets/pages/pipelines.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 3639db026cf..fb6ddc34f1f 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -748,7 +748,7 @@
   .grouped-pipeline-dropdown {
     right: -172px;
     top: 23px;
-    min-height: 191px;
+    min-height: 50px;
 
     a {
       color: $gl-text-color-light;
-- 
cgit v1.2.1


From 8ad5d3171ac1c9079a8a828a1ee9eb16ec21fd38 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 20 Dec 2016 08:25:39 -0600
Subject: Fix sizing of avatar circles; add border

---
 app/assets/stylesheets/framework/avatar.scss | 2 +-
 app/assets/stylesheets/pages/projects.scss   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 000e591e09c..48827578d94 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -64,7 +64,7 @@
   &.s32 { font-size: 20px; line-height: 30px; }
   &.s40 { font-size: 16px; line-height: 38px; }
   &.s60 { font-size: 32px; line-height: 58px; }
-  &.s70 { font-size: 34px; line-height: 68px; }
+  &.s70 { font-size: 34px; line-height: 70px; }
   &.s90 { font-size: 36px; line-height: 88px; }
   &.s110 { font-size: 40px; line-height: 108px; font-weight: 300; }
   &.s140 { font-size: 72px; line-height: 138px; }
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index a443b6a37b3..e16a553bcda 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -93,7 +93,6 @@
   .group-avatar {
     float: none;
     margin: 0 auto;
-    border: none;
 
     &.identicon {
       border-radius: 50%;
-- 
cgit v1.2.1


From 85666b7077728aeb2015030d603bc9c9fe6686c6 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 20 Dec 2016 17:21:02 -0600
Subject: apply margin on alert banners only when there is one or more alerts

---
 app/assets/stylesheets/framework/layout.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 59fae61a44f..5365b62e456 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -33,10 +33,12 @@ body {
 }
 
 .alert-wrapper {
-  margin-bottom: $gl-padding;
-
   .alert {
     margin-bottom: 0;
+
+    &:last-child {
+      margin-bottom: $gl-padding;
+    }
   }
 
   /* Stripe the background colors so that adjacent alert-warnings are distinct from one another */
-- 
cgit v1.2.1