Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

fix for the issue #6238 #6348

Closed
wants to merge 1 commit into from
Closed

fix for the issue #6238 #6348

wants to merge 1 commit into from

Conversation

ishan1608
Copy link
Contributor

This PR addresses issue #6238.
All the elements of "Find in Files" ( Ctrl-Shift-F ) (i.e. label text input and buttons), are in one line.
find-in-files fixed

I left the "Find and Replace" ( Ctrl-H ) as it was instead of forcing the "find-group" and "replace-group" into one line, as it seems more fit to me than forcing them in one line.
find-replace untouched

It seems more fit because the elements (i.e. label text input and buttons) of "find-group" and "replace-group" do not get broken down to many lines; they separately stay in one line only. Leaving the situation as it is will ease the "Replace" feature, when he/she is working in "Live Preview".

@ghost ghost assigned redmunds and peterflynn Jan 3, 2014
@peterflynn
Copy link
Member

@redmunds I'll take a look at this because I already have some similar fixes implemented locally (#6238 was assigned to me for Sprint 36 a few weeks ago).

@peterflynn
Copy link
Member

@ishanatmuz The overflow fix in #6380 seemed like a cleaner way to handle the general issue of content overflowing onto the side toolbar, so I've merged that. However, that still leaves the incorrect wrapping in the 'Find in Files' UI unfixed. Do you want to adjust your PR to tackle just that part?

I think the fix can even be simplified a bit from what you have: just wrapping the findinfiles-bar.html content in a <div id="find-group"> should work. It has the advantage of keeping the 'Find in Files' DOM more in line with the single-file Find/Replace UI, and doesn't require any changes to CSS either.

@peterflynn
Copy link
Member

Also, this needs to be synced up with master in general since the content in findinfiles-bar.html has changed a bit (see #6420). If you want to merge your current code with master and resolve the conflicts and adjust the fix there, feel free -- or you're welcome to close this and submit a new PR with just the adjusted fix on top of a clean master. Either way's ok with me.

@ishan1608
Copy link
Contributor Author

@peterflynn arguably yes the solution of overflowing contents on to sidebar in #6380 is a better one. I will close this PR and open a new one with adjustments.

@peterflynn
Copy link
Member

Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants