Skip to content

fix: Find and replace dialog mobile responsiveness #2853

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

Closed
mrkirthi-24 wants to merge 3 commits into from
Closed

fix: Find and replace dialog mobile responsiveness #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7dcaff
fix Find and Replace dialog box
mrkirthi-24 Jan 5, 2024
750f5eb
Update _editor.scss
mrkirthi-24 Jan 5, 2024
7f05d00
fix: find and replace dialog box mobile responsiveness
mrkirthi-24 Jan 6, 2024
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
11 changes: 9 additions & 2 deletions client/styles/components/_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ pre.CodeMirror-line {
}
// left: 0 !important;
width: #{48 / $base-font-size}rem;
z-index: 0;
}

/*
Expand All @@ -96,6 +97,7 @@ pre.CodeMirror-line {
right: 0;
width: 100%;
margin-left: 0;
z-index: 5;
}

z-index: 1;
Expand Down Expand Up @@ -138,7 +140,11 @@ pre.CodeMirror-line {

.CodeMirror-find-controls {
display: flex;
align-items: center;
align-items: center;

@media (max-width: 580px) {
padding: 0.6rem 0rem;
}
}
.CodeMirror-search-inputs {
width: 30%;
Expand All @@ -150,12 +156,13 @@ pre.CodeMirror-line {
align-items: center;
}
.CodeMirror-search-controls {
display: flex;
display: block;
align-items: center;
justify-content: end;
}
.CodeMirror-replace-controls {
display: flex;
padding-top: 1.4rem;
margin-left: #{10 / $base-font-size}rem;
}

Expand Down
55 changes: 26 additions & 29 deletions client/utils/codemirror-search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,8 @@ function startSearch(cm, state, query) {
var num_match = cm.state.search.annotate.matches.length;
//no matches found
if (num_match == 0) {
cm.display.wrapper.querySelector(
'.CodeMirror-search-results'
).innerText = i18n.t('CodemirrorFindAndReplace.NoResults');
cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText =
i18n.t('CodemirrorFindAndReplace.NoResults');
cm.removeOverlay(state.overlay, state.caseInsensitive);
} else {
var next =
Expand All @@ -384,9 +383,8 @@ function startSearch(cm, state, query) {
);
}) + 1;
var text_match = next + '/' + num_match;
cm.display.wrapper.querySelector(
'.CodeMirror-search-results'
).innerText = text_match;
cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText =
text_match;
}
}

Expand Down Expand Up @@ -572,9 +570,8 @@ function findNext(cm, rev, callback) {
s.from.ch === cursor.from().ch && s.from.line === cursor.from().line
) + 1;
var text_match = next + '/' + num_match;
cm.display.wrapper.querySelector(
'.CodeMirror-search-results'
).innerText = text_match;
cm.display.wrapper.querySelector('.CodeMirror-search-results').innerText =
text_match;
if (callback) callback(cursor.from(), cursor.to());
});
}
Expand Down Expand Up @@ -637,26 +634,6 @@ var getQueryDialog = function () {
</div>
</div>
<div class="CodeMirror-search-controls">
<div style="display: none;" id="Replace-controls-div" class="CodeMirror-replace-controls">
<button
title="${i18n.t('CodemirrorFindAndReplace.Replace')}"
aria-label="${i18n.t('CodemirrorFindAndReplace.Replace')}"
role="button"
id="Btn-replace"
class="CodeMirror-search-modifier-button CodeMirror-replace-button"
>
${i18n.t('CodemirrorFindAndReplace.Replace')}
</button>
<button
title="${i18n.t('CodemirrorFindAndReplace.ReplaceAll')}"
aria-label="${i18n.t('CodemirrorFindAndReplace.ReplaceAll')}"
role="button"
id="Btn-replace-all"
class="CodeMirror-search-modifier-button CodeMirror-replace-button"
>
${i18n.t('CodemirrorFindAndReplace.ReplaceAll')}
</button>
</div>
<div class="CodeMirror-find-controls">
<div class="CodeMirror-search-modifiers button-wrap">
<button
Expand Down Expand Up @@ -719,6 +696,26 @@ var getQueryDialog = function () {
</button>
</div>
</div>
<div style="display: none;" id="Replace-controls-div" class="CodeMirror-replace-controls">
<button
title="${i18n.t('CodemirrorFindAndReplace.Replace')}"
aria-label="${i18n.t('CodemirrorFindAndReplace.Replace')}"
role="button"
id="Btn-replace"
class="CodeMirror-search-modifier-button CodeMirror-replace-button"
>
${i18n.t('CodemirrorFindAndReplace.Replace')}
</button>
<button
title="${i18n.t('CodemirrorFindAndReplace.ReplaceAll')}"
aria-label="${i18n.t('CodemirrorFindAndReplace.ReplaceAll')}"
role="button"
id="Btn-replace-all"
class="CodeMirror-search-modifier-button CodeMirror-replace-button"
>
${i18n.t('CodemirrorFindAndReplace.ReplaceAll')}
</button>
</div>
</div>
</div>
`;
Expand Down