Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fork button #6223

Merged
merged 10 commits into from
Mar 6, 2019
Merged

Fix fork button #6223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1adda04
Fixes the fork button when user cannot fork, but should still see forks
jolheiser Mar 1, 2019
218e7d7
Fix logic flow
jolheiser Mar 1, 2019
45d2c2f
Merge branch 'master' into 6222_fix_fork_button
jolheiser Mar 1, 2019
4e68396
New disabled look
jolheiser Mar 2, 2019
d779d96
Merge branch 'master' into 6222_fix_fork_button
jolheiser Mar 2, 2019
d628293
Added @silverwind changes
jolheiser Mar 3, 2019
49a6feb
Merge branch 'master' into 6222_fix_fork_button
jolheiser Mar 3, 2019
4d89270
Fix border
jolheiser Mar 3, 2019
2228be9
Update styles
jolheiser Mar 5, 2019
673fa03
Merge branch 'master' into 6222_fix_fork_button
jolheiser Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/css/index.css
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions public/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,3 +1875,23 @@ tbody.commit-list {
display: flex;
align-items: center;
}

.repo-buttons .disabled-repo-button .label {
opacity: .5;
}

.repo-buttons .disabled-repo-button a.button {
opacity: .5;
cursor: not-allowed;
}

.repo-buttons .disabled-repo-button a.button:hover {
background: none !important;
color: rgba(0,0,0,.6) !important;
box-shadow: 0 0 0 1px rgba(34,36,38,.15) inset !important;
}

.repo-buttons .ui.labeled.button > .label {
border-left: none !important;
margin: 0 !important;
}
2 changes: 1 addition & 1 deletion templates/repo/header.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</a>
</div>
{{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
<div class="ui labeled button {{if and (not $.CanSignedUserFork) ($.IsSigned)}}disabled{{end}}" tabindex="0">
<div class="ui labeled button {{if and ($.IsSigned) (not $.CanSignedUserFork)}}disabled-repo-button{{end}}" tabindex="0">
<a class="ui compact basic button {{if or (not $.IsSigned) (not $.CanSignedUserFork)}}poping up{{end}}" {{if $.CanSignedUserFork}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else if $.IsSigned}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" {{ else }} data-content="{{$.i18n.Tr "repo.fork_guest_user" }}" href="{{AppSubUrl}}/user/login?redirect_to={{AppSubUrl}}/repo/fork/{{.ID}}" {{end}} data-position="top center" data-variation="tiny">
<i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}}
</a>
Expand Down