Commit dab9481b authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'mirror-misplaced-button' into 'master'

Fixed misplaced mirror button

The mirror repo button was misplaced on the tags page & made the content below look weird.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19191

![Screen_Shot_2016-07-07_at_11.35.35](/uploads/d7e87dfeb3491e53342e9e0a1a342f2f/Screen_Shot_2016-07-07_at_11.35.35.png)

See merge request !536
parents 37c8d506 fb6f40b5
...@@ -13,6 +13,7 @@ v 8.10.0 (unreleased) ...@@ -13,6 +13,7 @@ v 8.10.0 (unreleased)
- Add a new column `artifacts_size` to table `ci_builds` !4964 - Add a new column `artifacts_size` to table `ci_builds` !4964
- Let Workhorse serve format-patch diffs - Let Workhorse serve format-patch diffs
- Make images fit to the size of the viewport !4810 - Make images fit to the size of the viewport !4810
- Fixed misplaced mirror repository button on tags page
- Fix check for New Branch button on Issue page !4630 (winniehell) - Fix check for New Branch button on Issue page !4630 (winniehell)
- Fix MR-auto-close text added to description. !4836 - Fix MR-auto-close text added to description. !4836
- Fix issue, preventing users w/o push access to sort tags !5105 (redetection) - Fix issue, preventing users w/o push access to sort tags !5105 (redetection)
......
...@@ -640,3 +640,19 @@ pre.light-well { ...@@ -640,3 +640,19 @@ pre.light-well {
width: 300px; width: 300px;
} }
} }
.project-mirror-text {
@media (min-width: $screen-sm-min) {
float: left;
line-height: 35px;
}
}
.project-mirror-button {
margin-top: 10px;
@media (min-width: $screen-sm-min) {
float: right;
margin-top: 0;
}
}
- if @project.mirror? - if @project.mirror?
.gray-content-block.second-block .prepend-top-default.gray-content-block.second-block.clearfix
.pull-right
= render "shared/mirror_update_button"
- import_url = @project.safe_import_url - import_url = @project.safe_import_url
.oneline .oneline.project-mirror-text
This project is mirrored from #{link_to import_url, import_url}. This project is mirrored from #{link_to import_url, import_url}.
= render "shared/mirror_status" = render "shared/mirror_status"
...@@ -13,3 +10,5 @@ ...@@ -13,3 +10,5 @@
%span.has-tooltip{data: { html: "true", title: branch_diverged_tooltip_message }} %span.has-tooltip{data: { html: "true", title: branch_diverged_tooltip_message }}
= icon('exclamation-triangle') = icon('exclamation-triangle')
This branch has diverged from upstream. This branch has diverged from upstream.
.project-mirror-button
= render "shared/mirror_update_button"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment