move progress bar from milestone summary into the sidebar

1 files changed, 25 insertions, 38 deletions

diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index ce3adbb9114..e700637d4f5 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -53,6 +53,21 @@
 }
 
 .milestone-sidebar {
+  .gutter-toggle {
+    margin-bottom: 10px;
+  }
+
+  .milestone-progress {
+    .title {
+      padding-top: 5px;
+    }
+
+    .progress {
+      height: 6px;
+      margin: 0;
+    }
+  }
+
   .remaining-days strong {
     font-weight: normal;
   }
@@ -67,50 +82,22 @@
     margin-right: 0;
   }
 
-  .right-sidebar-collapsed & {
-    .reference {
-      border-top: 1px solid $border-gray-normal;
-    }
-  }
-}
-
-.milestone-summary {
-  .milestone-stat {
-    white-space: nowrap;
-    margin-right: 10px;
-
-    &.with-drilldown {
-      margin-right: 2px;
-    }
-  }
-
-  .milestone-stats-and-buttons {
-    display: flex;
-    justify-content: flex-start;
-    flex-wrap: wrap;
+  .milestone-progress {
+    .sidebar-collapsed-icon {
+      clear: both;
+      padding: 15px 5px 5px;
 
-    @media (min-width: $screen-xs-min) {
-      justify-content: space-between;
-      flex-wrap: nowrap;
+      .progress {
+        margin: 5px 0;
+      }
     }
   }
 
-  .milestone-stats {
-    order: 2;
-    width: 100%;
-    padding: 7px 0;
-    flex-shrink: 1;
-
-    @media (min-width: $screen-xs-min) {
-      // when displayed on one line stats go first, buttons second
-      order: 1;
+  .right-sidebar-collapsed & {
+    .reference {
+      border-top: 1px solid $border-gray-normal;
     }
   }
-
-  .progress {
-    width: 100%;
-    margin: 15px 0;
-  }
 }
 
 .issues-sortable-list,