Skip to content

Fix Show/hide filetree button on small displays #27881

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

Merged
merged 6 commits into from
Nov 17, 2023
Merged

Fix Show/hide filetree button on small displays #27881

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dae527f
Fix Show/hide filetree button on small displays
sebastian-sauer Nov 2, 2023
dca299a
Remove not needed important
sebastian-sauer Nov 2, 2023
ecc0d0f
remove not needed special css and use util functions
sebastian-sauer Nov 3, 2023
6b2356f
Use not mobile class for file-tree
sebastian-sauer Nov 15, 2023
77ca718
Merge branch 'main' into bugfix/fix_file_tree_button_small_displays
sebastian-sauer Nov 15, 2023
c6c5ee4
Merge branch 'main' into bugfix/fix_file_tree_button_small_displays
wxiaoguang Nov 17, 2023
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
4 changes: 2 additions & 2 deletions templates/repo/diff/box.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="diff-detail-box diff-box">
<div class="gt-df gt-ac gt-fw">
{{if $showFileTree}}
<button class="diff-toggle-file-tree-button gt-df gt-ac not-mobile" data-show-text="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}" data-hide-text="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
<button class="diff-toggle-file-tree-button hide-992 btn interact-fg" data-show-text="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}" data-hide-text="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
{{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}}
{{svg "octicon-sidebar-collapse" 20 "icon gt-hidden"}}
{{svg "octicon-sidebar-expand" 20 "icon gt-hidden"}}
Expand Down Expand Up @@ -89,7 +89,7 @@
{{end}}
<div id="diff-container">
{{if $showFileTree}}
<div id="diff-file-tree" class="gt-hidden"></div>
<div id="diff-file-tree" class="gt-hidden hide-992"></div>
<script>
if (diffTreeVisible) document.getElementById('diff-file-tree').classList.remove('gt-hidden');
</script>
Expand Down
7 changes: 7 additions & 0 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,13 @@ img.ui.avatar,
}
}

@media (max-width: 991.98px) {
/* double selector so it wins over .gt-df etc */
.hide-992.hide-992 {
display: none !important;
}
}

.ui.menu.new-menu {
margin-bottom: 15px;
background: var(--color-header-wrapper);
Expand Down
20 changes: 0 additions & 20 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2754,26 +2754,6 @@ tbody.commit-list {
overflow-y: auto;
}

.diff-toggle-file-tree-button {
background: none;
border: none;
user-select: none;
color: inherit;
}

.diff-toggle-file-tree-button:hover {
color: var(--color-primary);
}

@media (max-width: 991.98px) {
#diff-file-tree {
display: none !important;
}
.diff-toggle-file-tree-button {
display: none !important;
}
}

.ui.message.unicode-escape-prompt {
margin-bottom: 0;
border-radius: 0;
Expand Down