diff options
author | yury-n <yury-n@deviantart.com> | 2016-07-18 15:52:57 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-04 15:15:47 +0000 |
commit | bf127ce268d69355ebe5251d97b64b68627d930c (patch) | |
tree | a18636659e9b457becde1bcd9a006b2c29ace3cf /app | |
parent | 8c4deda010030e4e1f4747fb3e53d24b2a0c296a (diff) | |
download | gitlab-ce-bf127ce268d69355ebe5251d97b64b68627d930c.tar.gz |
Align the progress buttons with the milestone buttons -- do not margin right on the last button
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index c784db0e225..cf4657b54f3 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -31,7 +31,6 @@ margin-right: 7px; } - // Issue title span a { color: $gl-text-color; word-wrap: break-word; @@ -40,7 +39,6 @@ } .milestone-summary { - h4 { margin-bottom: 0; } @@ -48,8 +46,9 @@ .milestone-stat { white-space: nowrap; margin-right: 10px; + &.with-drilldown { - margin-right: 2px; // the drill down element should sit closer to its parent + margin-right: 2px; } } @@ -60,23 +59,19 @@ .milestone-stats-and-buttons { display: flex; justify-content: flex-start; - // on small screens split into two line flex-wrap: wrap; @media (min-width: $screen-xs-min) { - // on bigger screens show on one line justify-content: space-between; flex-wrap: nowrap; } } .milestone-progress-buttons { - // for small devices buttons go first order: 1; - // buttons go on its own line below the header and need some margin margin-top: 10px; + @media (min-width: $screen-xs-min) { - // when displayed on one line stats go first, buttons second order: 2; margin-top: 0; flex-shrink: 0; @@ -85,6 +80,9 @@ .btn { float: left; margin-right: $btn-side-margin; + &:last-child { + margin-right: 0; + } } } @@ -143,21 +141,23 @@ flex-flow: row; align-items: center; flex-wrap: wrap; + .status-box { - margin-top: 0; // no need for margin-top, vertical alignment is done by flexbox + margin-top: 0; } + .milestone-buttons { - // flex flow is row (left to right) - // but buttons should stick to the right side margin-left: auto; } .status-box { order: 1; } + .milestone-buttons { order: 2; } + .header-text-content { order: 3; width: 100%; @@ -168,7 +168,6 @@ } @media (min-width: $screen-xs-min) { - .milestone-buttons .verbose { display: inline; } @@ -177,6 +176,7 @@ order: 2; width: auto; } + .milestone-buttons { order: 3; } |