diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-06 10:10:06 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-06 10:10:06 +0100 |
commit | 4274418733c75198c38df5745c2827c6009bbc65 (patch) | |
tree | 574c4d2286cdd8462bb31869124ff02ee5ed3a81 /app/assets/stylesheets/pages/milestone.scss | |
parent | 9e2b996f32b47c4714543d7c74fc815893da68cf (diff) | |
parent | eba27fe022562e6e5cdae81a08addff6ec152826 (diff) | |
download | gitlab-ce-4274418733c75198c38df5745c2827c6009bbc65.tar.gz |
Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-cluster-application-section
Diffstat (limited to 'app/assets/stylesheets/pages/milestone.scss')
-rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 32039936be7..ae8fa45a2d7 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -66,6 +66,15 @@ height: 6px; margin: 0; } + + .sidebar-collapsed-icon { + clear: both; + padding: 15px 5px 5px; + + .progress { + margin: 5px 0; + } + } } .collapsed-milestone-date { @@ -93,17 +102,6 @@ margin-right: 0; } - .milestone-progress { - .sidebar-collapsed-icon { - clear: both; - padding: 15px 5px 5px; - - .progress { - margin: 5px 0; - } - } - } - .right-sidebar-collapsed & { .reference { border-top: 1px solid $border-gray-normal; @@ -156,18 +154,16 @@ .status-box { margin-top: 0; - } - - .milestone-buttons { - margin-left: auto; - } - - .status-box { order: 1; } .milestone-buttons { + margin-left: auto; order: 2; + + .verbose { + display: none; + } } .header-text-content { @@ -175,10 +171,6 @@ width: 100%; } - .milestone-buttons .verbose { - display: none; - } - @media (min-width: $screen-xs-min) { .milestone-buttons .verbose { display: inline; |