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
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions src/htmlContent/findinfiles-bar.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{{CMD_FIND}}:
<div class="search-input-container"><input type="text" id="find-what" value="{{value}}" /><div class="error"></div><!--
--><button id="find-case-sensitive" class="btn no-focus" tabindex="-1" title="{{BUTTON_CASESENSITIVE_HINT}}"><div class="button-icon"></div></button><!--
--><button id="find-regexp" class="btn no-focus" tabindex="-1" title="{{BUTTON_REGEXP_HINT}}"><div class="button-icon"></div></button>

<div class="no-results-message">{{FIND_NO_RESULTS}}</div></div>
<div class="message">
<span id="searchlabel">{{{label}}}</span>
<div id="find-in-files-bar">
{{CMD_FIND}}:
<div class="search-input-container"><input type="text" id="find-what" value="{{value}}" /><div class="error"></div><!--
--><button id="find-case-sensitive" class="btn no-focus" tabindex="-1" title="{{BUTTON_CASESENSITIVE_HINT}}"><div class="button-icon"></div></button><!--
--><button id="find-regexp" class="btn no-focus" tabindex="-1" title="{{BUTTON_REGEXP_HINT}}"><div class="button-icon"></div></button>

<div class="no-results-message">{{FIND_NO_RESULTS}}</div></div>
<div class="message">
<span id="searchlabel">{{{label}}}</span>
</div>
</div>
3 changes: 2 additions & 1 deletion src/styles/brackets.less
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ a, img {
}
}

#find-group, #replace-group {
#find-group, #replace-group, #find-in-files-bar {
display: inline-block;
white-space: nowrap;
}
Expand Down Expand Up @@ -1144,6 +1144,7 @@ a, img {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

#find-case-sensitive, #replace-yes {
border-left: none;
margin-left: 0px;
Expand Down
2 changes: 2 additions & 0 deletions src/styles/brackets_patterns_override.less
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ a:focus {
background: @main-toolbar-background-color;
padding: 7px 0px;

z-index: @z-index-brackets-main-toolbar;

// Ensure icons are vertically stacked & horizontally centered
.vbox;
.box-flex(1);
Expand Down
1 change: 1 addition & 0 deletions src/styles/brackets_variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
@z-index-brackets-toolbar: (@z-index-brackets-ui + 1);
@z-index-brackets-max: @z-index-brackets-toolbar;
@z-index-brackets-modalbar: (@z-index-brackets-toolbar - 1);
@z-index-brackets-main-toolbar: (@z-index-brackets-toolbar + 1);

@z-index-brackets-sidebar-resizer: (@z-index-brackets-ui + 2);
@z-index-brackets-resizer-div: (@z-index-brackets-sidebar-resizer + 1);
Expand Down