summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-10-03 15:19:13 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2016-11-12 16:40:26 +0000
commitbbf7033bb2df4eb69ce23c189e9ee12c4ded7b38 (patch)
tree68cea26ef1742202c0ca9363075ab403d6a1ff96
parentbf127ce268d69355ebe5251d97b64b68627d930c (diff)
downloadgitlab-ce-bbf7033bb2df4eb69ce23c189e9ee12c4ded7b38.tar.gz
Corrected lines failed by linter
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/assets/stylesheets/pages/milestone.scss6
2 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 375ca9d3044..93a8776a585 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ entry.
- Fix sidekiq stats in admin area (blackst0ne)
- Added label description as tooltip to issue board list title
- Created cycle analytics bundle JavaScript file
+- Make the milestone page more responsive (yury-n)
- Hides container registry when repository is disabled
- API: Fix booleans not recognized as such when using the `to_boolean` helper
- Removed delete branch tooltip !6954
@@ -984,7 +985,6 @@ entry.
- Add Bugzilla integration. !4930 (iamtjg)
- Fix new snippet style bug (elliotec)
- Instrument Rinku usage
- - Make the milestone page more responsive
- Be explicit to define merge request discussion variables
- Use cache for todos counter calling TodoService
- Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index cf4657b54f3..8843d1463db 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -39,10 +39,6 @@
}
.milestone-summary {
- h4 {
- margin-bottom: 0;
- }
-
.milestone-stat {
white-space: nowrap;
margin-right: 10px;
@@ -80,6 +76,7 @@
.btn {
float: left;
margin-right: $btn-side-margin;
+
&:last-child {
margin-right: 0;
}
@@ -91,6 +88,7 @@
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;