From 65e38fd43702ed108f4329b403f5ecde66f61bd6 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Wed, 21 Jun 2017 22:39:01 +1000
Subject: remove list item tree lines

---
 .../components/mr_widget_memory_usage.js           |  1 -
 .../components/mr_widget_related_links.js          |  1 -
 .../components/states/mr_widget_locked.js          |  1 -
 .../mr_widget_merge_when_pipeline_succeeds.js      |  1 -
 .../components/states/mr_widget_merged.js          |  1 -
 .../vue_merge_request_widget/mr_widget_options.js  |  1 -
 app/assets/stylesheets/pages/merge_requests.scss   | 37 ----------------------
 changelogs/unreleased/33982-remove-trees.yml       |  4 +++
 8 files changed, 4 insertions(+), 43 deletions(-)
 create mode 100644 changelogs/unreleased/33982-remove-trees.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
index 76cb71b6c12..96cad2e7038 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
@@ -113,7 +113,6 @@ export default {
   },
   template: `
     <div class="mr-info-list clearfix mr-memory-usage js-mr-memory-usage">
-      <div class="legend"></div>
       <p
         v-if="shouldShowLoading"
         class="usage-info js-usage-info usage-info-loading">
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js
index 686cb38cbb1..f5c7d1ec8d8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js
@@ -45,7 +45,6 @@ export default {
   },
   template: `
     <div v-if="hasLinks">
-      <div class="legend"></div>
       <p v-if="relatedLinks.closing">
         {{closingText}}
         <span v-html="relatedLinks.closing"></span>.
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_locked.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_locked.js
index 0bd31731a0b..02245d82a5d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_locked.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_locked.js
@@ -11,7 +11,6 @@ export default {
         class="fa fa-spinner fa-spin"
         aria-hidden="true" />
       <section class="mr-info-list mr-links">
-        <div class="legend"></div>
         <p>
           The changes will be merged into
           <span class="label-branch">
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
index 419d174f3ff..46c76f21a8a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
@@ -81,7 +81,6 @@ export default {
         </a>
       </h4>
       <section class="mr-info-list">
-        <div class="legend"></div>
         <p>The changes will be merged into
           <a
             :href="mr.targetBranchPath"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
index 9b8eed9016d..980cce57300 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
@@ -68,7 +68,6 @@ export default {
         :dateTitle="mr.updatedAt"
         :dateReadable="mr.mergedAt" />
       <section class="mr-info-list">
-        <div class="legend"></div>
         <p>
           The changes were merged into
           <span class="label-branch">
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index 222d0b7f79e..fb439d73cf8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -241,7 +241,6 @@ export default {
       <section
         v-if="shouldRenderRelatedLinks"
         class="mr-info-list mr-links">
-        <div class="legend"></div>
         <mr-widget-related-links
           :is-merged="mr.isMerged"
           :related-links="mr.relatedLinks" />
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index c0bd045f1fc..8f31951850e 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -519,47 +519,16 @@
     position: relative;
     padding-left: 15px;
 
-    &::before {
-      content: '';
-      position: absolute;
-      border-top: 2px solid $border-color;
-      height: 1px;
-      top: 9px;
-      width: 8px;
-      left: 0;
-    }
-
     &:last-child {
       margin-bottom: 0;
     }
   }
-
-  .legend {
-    height: 100%;
-    width: 2px;
-    background: $border-color;
-    position: absolute;
-    top: -9px;
-  }
 }
 
 .mr-info-list.mr-memory-usage {
-  .legend {
-    height: 65%;
-    top: 0;
-
-    @media (max-width: $screen-xs-max) {
-      height: 20px;
-    }
-  }
-
   p {
     float: left;
     padding-left: 21px;
-
-    &::before {
-      top: 13px;
-    }
   }
 
   .memory-graph-container {
@@ -805,10 +774,4 @@
     margin-right: 10px;
     font-size: 16px;
   }
-
-  @media (max-width: $screen-md-min) {
-    .mr-info-list.mr-memory-usage .legend {
-      height: 80%;
-    }
-  }
 }
diff --git a/changelogs/unreleased/33982-remove-trees.yml b/changelogs/unreleased/33982-remove-trees.yml
new file mode 100644
index 00000000000..f380fc94db6
--- /dev/null
+++ b/changelogs/unreleased/33982-remove-trees.yml
@@ -0,0 +1,4 @@
+---
+title: remove list item marks from merge request widget
+merge_request:
+author:
-- 
cgit v1.2.1