diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-22 17:58:28 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-07 15:27:14 -0500 |
| commit | 19e2bf1c21a853e45db0c18133e5f1b1234ad09f (patch) | |
| tree | 35499078416f41c25f76040962943b00e55ff40c /app | |
| parent | 894bd04decf1a2e6a7ca7b1450db9ac7bddd4735 (diff) | |
| download | gitlab-ce-19e2bf1c21a853e45db0c18133e5f1b1234ad09f.tar.gz | |
Fix failing specs and improve html
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 11 | ||||
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 94b2a0d88a1..6b865730487 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -68,3 +68,14 @@ border-bottom: 1px solid $border-color; padding: 20px 0; } + +@media (max-width: $screen-sm-min) { + .milestone-actions { + @include clearfix(); + padding-top: $gl-vert-padding; + + .btn:first-child { + margin-left: 0; + } + } +} diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 27f4354cf42..b91f09f76ee 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -50,7 +50,7 @@ module MilestonesHelper # Show 'active' class if provided GET param matches check # `or_blank` allows the function to return 'active' when given an empty param # Could be refactored to be simpler but that may make it harder to read - def milestone_class_for_state(param, check, match_blank_param=false) + def milestone_class_for_state(param, check, match_blank_param = false) if match_blank_param 'active' if param.blank? || param == check else diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index acc3ccf4dcf..3dccfb147bf 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -33,7 +33,7 @@ - if @project .row .col-sm-6= render('shared/milestone_expired', milestone: milestone) - .col-sm-6 + .col-sm-6.milestone-actions - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? = link_to edit_namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), class: "btn btn-xs btn-grouped" do Edit |