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 SVG side by side comparison link #17375

Merged
merged 8 commits into from
Oct 21, 2021
Merged

Fix SVG side by side comparison link #17375

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f81876
Remove swipe-bar z-index
saitho Oct 20, 2021
8a0fef1
Unique names for image tabs in pull request
saitho Oct 20, 2021
22278fe
Merge branch 'main' into bugfix/svg_side_by_side_comparison
lafriks Oct 20, 2021
208975e
Merge branch 'main' into bugfix/svg_side_by_side_comparison
lunny Oct 21, 2021
8973e90
Merge branch 'main' into bugfix/svg_side_by_side_comparison
lunny Oct 21, 2021
d5d0d22
Merge branch 'main' into bugfix/svg_side_by_side_comparison
wxiaoguang Oct 21, 2021
6968190
Merge branch 'main' into bugfix/svg_side_by_side_comparison
wxiaoguang Oct 21, 2021
e8c36c8
Merge branch 'main' into bugfix/svg_side_by_side_comparison
wxiaoguang Oct 21, 2021
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
12 changes: 6 additions & 6 deletions templates/repo/diff/image_diff.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<div class="image-diff" data-path-before="{{$imagePathOld}}" data-path-after="{{$imagePathNew}}">
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu">
<div class="new-menu-inner">
<a class="item active" data-tab="diff-side-by-side">{{.root.i18n.Tr "repo.diff.image.side_by_side"}}</a>
<a class="item active" data-tab="diff-side-by-side-{{ .file.Index }}">{{.root.i18n.Tr "repo.diff.image.side_by_side"}}</a>
{{if and .blobBase .blobHead}}
<a class="item" data-tab="diff-swipe">{{.root.i18n.Tr "repo.diff.image.swipe"}}</a>
<a class="item" data-tab="diff-overlay">{{.root.i18n.Tr "repo.diff.image.overlay"}}</a>
<a class="item" data-tab="diff-swipe-{{ .file.Index }}">{{.root.i18n.Tr "repo.diff.image.swipe"}}</a>
<a class="item" data-tab="diff-overlay-{{ .file.Index }}">{{.root.i18n.Tr "repo.diff.image.overlay"}}</a>
{{end}}
</div>
</div>
<div class="hide">
<div class="ui bottom attached tab image-diff-container active" data-tab="diff-side-by-side">
<div class="ui bottom attached tab image-diff-container active" data-tab="diff-side-by-side-{{ .file.Index }}">
<div class="diff-side-by-side">
{{if .blobBase }}
<span class="side">
Expand Down Expand Up @@ -49,7 +49,7 @@
</div>
</div>
{{if and .blobBase .blobHead}}
<div class="ui bottom attached tab image-diff-container" data-tab="diff-swipe">
<div class="ui bottom attached tab image-diff-container" data-tab="diff-swipe-{{ .file.Index }}">
<div class="diff-swipe">
<div class="swipe-frame">
<span class="before-container"><img class="image-before" /></span>
Expand All @@ -63,7 +63,7 @@
</div>
</div>
</div>
<div class="ui bottom attached tab image-diff-container" data-tab="diff-overlay">
<div class="ui bottom attached tab image-diff-container" data-tab="diff-overlay-{{ .file.Index }}">
<div class="diff-overlay">
<div class="overlay-frame">
<div class="ui centered">
Expand Down
1 change: 0 additions & 1 deletion web_src/less/features/imagediff.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
}

.swipe-bar {
z-index: 100;
position: absolute;
height: 100%;
top: 0;
Expand Down