Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
abe10452
Commit
abe10452
authored
Jul 07, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed misplaced mirror button
Closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/19191
parent
bc1a911e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+16
-0
app/views/projects/commits/_mirror_status.html.haml
app/views/projects/commits/_mirror_status.html.haml
+4
-5
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
abe10452
...
...
@@ -640,3 +640,19 @@ pre.light-well {
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
;
}
}
app/views/projects/commits/_mirror_status.html.haml
View file @
abe10452
-
if
@project
.
mirror?
.gray-content-block.second-block
.pull-right
=
render
"shared/mirror_update_button"
.prepend-top-default.gray-content-block.second-block.clearfix
-
import_url
=
@project
.
safe_import_url
.oneline
.oneline
.project-mirror-text
This project is mirrored from
#{
link_to
import_url
,
import_url
}
.
=
render
"shared/mirror_status"
...
...
@@ -13,3 +10,5 @@
%span
.has-tooltip
{
data:
{
html:
"true"
,
title:
branch_diverged_tooltip_message
}}
=
icon
(
'exclamation-triangle'
)
This branch has diverged from upstream.
.project-mirror-button
=
render
"shared/mirror_update_button"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment