diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-04-01 19:45:28 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-04-01 19:45:28 +0000 |
| commit | 6de540100b61f4cdbf8f1e8c5032376c963810b4 (patch) | |
| tree | bac3eed9f5f2276a960c874fb996c04d7ae6df45 | |
| parent | 731d574d9359eca8cd37ef46e525bbc9603837a3 (diff) | |
| parent | ac01a1b1a39b8fd669952a7b19c52da7fea97c42 (diff) | |
| download | gitlab-ce-6de540100b61f4cdbf8f1e8c5032376c963810b4.tar.gz | |
Merge branch '20914-project-home-width' into 'master'
20914 Limits line length for project home page
Closes #20914
See merge request !10346
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/20914-project-home-width.yml | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 79a0dc1b959..0fd19780570 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -1,6 +1,6 @@ - empty_repo = @project.empty_repo? .project-home-panel.text-center{ class: ("empty-project" if empty_repo) } - %div{ class: container_class } + .limit-container-width{ class: container_class } .avatar-container.s70.project-avatar = project_icon(@project, alt: @project.name, class: 'avatar s70 avatar-tile') %h1.project-title diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index de1229d58aa..edfe6da1816 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -13,7 +13,7 @@ = render "home_panel" - if current_user && can?(current_user, :download_code, @project) - %nav.project-stats{ class: container_class } + %nav.project-stats.limit-container-width{ class: container_class } %ul.nav %li = link_to project_files_path(@project) do @@ -74,11 +74,11 @@ Set up auto deploy - if @repository.commit - %div{ class: container_class } + .limit-container-width{ class: container_class } .project-last-commit = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project -%div{ class: container_class } +.limit-container-width{ class: container_class } - if @project.archived? .text-warning.center.prepend-top-20 %p diff --git a/changelogs/unreleased/20914-project-home-width.yml b/changelogs/unreleased/20914-project-home-width.yml new file mode 100644 index 00000000000..323a614f3c8 --- /dev/null +++ b/changelogs/unreleased/20914-project-home-width.yml @@ -0,0 +1,4 @@ +--- +title: Limit line length for project home page +merge_request: +author: |