diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 23 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 13 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
4 files changed, 23 insertions, 16 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3b89fa05801..de51f0b8a10 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ v 8.10.0 (unreleased) - Fix check for New Branch button on Issue page !4630 (winniehell) - Fix MR-auto-close text added to description. !4836 - Fix pagination when sorting by columns with lots of ties (like priority) + - Updated project header design - Exclude email check from the standard health check - Fix changing issue state columns in milestone view - Add notification settings dropdown for groups diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 37f21b99d3f..94cd9ffa6af 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -89,7 +89,10 @@ } .project-home-desc { + margin-left: auto; + margin-right: auto; margin-bottom: 15px; + max-width: 480px; > p { margin-bottom: 0; @@ -367,6 +370,15 @@ a.deploy-project-label { &:not(:last-child) { margin-right: $gl-padding; } + + &.project-repo-buttons-right { + margin-top: 10px; + + @media (min-width: $screen-md-min) { + float: right; + margin-top: 0; + } + } } .nav > li > a { @@ -498,7 +510,7 @@ pre.light-well { } .ci-status { - margin-right: 16px; + margin-right: $gl-padding; } .commit-row-message { @@ -506,19 +518,12 @@ pre.light-well { } .commit_short_id { - margin: 0 5px; + margin-right: 5px; color: $gl-link-color; font-weight: 600; } .commit-author-link { - margin-left: 7px; - text-decoration: none; - .avatar { - float: none; - margin-right: 4px; - } - .commit-author-name { font-weight: 600; } diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index c935d05636d..f81f25d0f1e 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -9,13 +9,14 @@ - if @project.description.present? .project-home-desc - = markdown(@project.description, pipeline: :description) + - if @project.description.present? + = markdown(@project.description, pipeline: :description) - - if forked_from_project = @project.forked_from_project - .cover-desc - Forked from - = link_to project_path(forked_from_project) do - = forked_from_project.namespace.try(:name) + - if forked_from_project = @project.forked_from_project + %p + Forked from + = link_to project_path(forked_from_project) do + = forked_from_project.namespace.try(:name) .project-repo-buttons.project-action-buttons .count-buttons diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 50c252e1359..58d8e068754 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -60,7 +60,7 @@ %li.missing = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do Set Up CI - %li.pull-right + %li.project-repo-buttons-right .project-repo-buttons.project-right-buttons - if current_user = render 'shared/members/access_request_buttons', source: @project |