Skip to content

Commit 853f1f9

Browse files
committed
[#1519] Minor styling changes
1 parent afe8733 commit 853f1f9

File tree

2 files changed

+24
-32
lines changed

2 files changed

+24
-32
lines changed

client/styles/components/_editor.scss

+17-27
Original file line numberDiff line numberDiff line change
@@ -110,40 +110,47 @@ pre.CodeMirror-line {
110110
flex-wrap: wrap;
111111
justify-content: space-between;
112112
}
113+
113114
.Toggle-replace-btn-div {
114115
height: 40px;
115116
padding: 0;
116117
}
118+
117119
.Toggle-replace-btn-div > button {
118120
width: 100%;
119121
height: 100%;
120122
}
123+
121124
.CodeMirror-find-div {
122125
padding: 0px;
123126
display: flex;
124127
justify-content: flex-start;
125128
align-items: center;
126129
flex-wrap: nowrap;
127130
}
131+
128132
.CodeMirror-search-modifiers {
129133
margin-left: 10px;
130134
}
135+
131136
.CodeMirror-search-results {
132137
margin: 0px 20px;
133138
width: 75px;
139+
font-size: #{12/$base-font-size}rem;
134140
}
141+
135142
.CodeMirror-find-controls {
136143
display: flex;
137144
}
138145

139146
.CodeMirror-replace-div {
140147
display: flex;
141-
width: 293px;
142-
justify-content: center;
148+
justify-content: flex-start;
143149
align-items: center;
144150
}
145151
.CodeMirror-replace-controls {
146152
display: flex;
153+
margin-left: #{10 / $base-font-size}rem;
147154
}
148155

149156
.CodeMirror-replace-options {
@@ -168,6 +175,7 @@ pre.CodeMirror-line {
168175
.CodeMirror-search-field {
169176
display: block;
170177
width: 100%;
178+
max-width: #{166/$base-font-size}rem;
171179
margin-bottom: #{4 / $base-font-size}rem;
172180
@include themify() {
173181
color: getThemifyVariable('input-text-color');
@@ -176,6 +184,11 @@ pre.CodeMirror-line {
176184
}
177185
}
178186

187+
.CodeMirror-search-nav {
188+
display: flex;
189+
align-items: center;
190+
}
191+
179192
.CodeMirror-search-count {
180193
display: block;
181194
height: #{20 / $base-font-size}rem;
@@ -187,9 +200,6 @@ pre.CodeMirror-line {
187200
justify-content: space-between;
188201
}
189202

190-
/*
191-
192-
*/
193203
.CodeMirror-search-modifiers {
194204
display: flex;
195205
justify-content: flex-end;
@@ -269,32 +279,12 @@ pre.CodeMirror-line {
269279
background-image: url(../images/down-arrow.svg?byUrl)
270280
}
271281

272-
// Replace button
273-
.CodeMirror-replace-button::after {
274-
display: block;
275-
content: ' ';
276-
277-
width: 20px;
278-
height: 20px;
279-
280-
@include icon();
281-
282-
background-repeat: no-repeat;
283-
background-position: center;
284-
}
285-
.CodeMirror-replace-button.replace::after {
286-
background-image: url(../images/replace.svg?byUrl);
287-
}
288-
.CodeMirror-replace-button.replace-all::after {
289-
background-image: url(../images/replace-all.svg?byUrl);
290-
}
291-
292282
/*
293283
Close button
294284
*/
295-
.CodeMirror-close-button {
285+
.CodeMirror-close-button-container {
296286
display: flex;
297-
flex-direction: row;
287+
align-items: center;
298288
}
299289

300290
// Visually hide button text

client/utils/codemirror-search.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ export default function(CodeMirror) {
534534
</button>
535535
</div>
536536
<div class="CodeMirror-search-nav">
537-
<button class="CodeMirror-search-results">No results</button>
537+
<p class="CodeMirror-search-results">No results</p>
538538
<button
539539
title="Previous"
540540
aria-label="Previous"
@@ -548,7 +548,7 @@ export default function(CodeMirror) {
548548
>
549549
</button>
550550
</div>
551-
<div>
551+
<div class="CodeMirror-close-button-container">
552552
<button
553553
title="Close"
554554
aria-label="Close"
@@ -558,23 +558,25 @@ export default function(CodeMirror) {
558558
</div>
559559
</div>
560560
<div style="height: 0px; overflow: hidden;" class="CodeMirror-replace-div">
561-
<input id="Replace-input-field" type="text" placeholder="Text to replace" class="search-input CodeMirror-search-field"/><div class="close icon"></div>
561+
<input id="Replace-input-field" type="text" placeholder="Text to replace" class="search-input CodeMirror-search-field"/>
562562
<div class="CodeMirror-replace-controls">
563563
<button
564564
title="Replace"
565565
aria-label="Replace"
566566
role="button"
567567
id="Btn-replace"
568-
class="CodeMirror-search-modifier-button CodeMirror-replace-button icon replace"
568+
class="CodeMirror-search-modifier-button CodeMirror-replace-button"
569569
>
570+
Replace
570571
</button>
571572
<button
572573
title="Replace All"
573574
aria-label="Replace All"
574575
role="button"
575576
id="Btn-replace-all"
576-
class="CodeMirror-search-modifier-button CodeMirror-replace-button icon replace-all"
577+
class="CodeMirror-search-modifier-button CodeMirror-replace-button"
577578
>
579+
Replace All
578580
</button>
579581
</div>
580582
</div>

0 commit comments

Comments
 (0)