Skip to content

Commit

Permalink
Resolve #712
Browse files Browse the repository at this point in the history
  • Loading branch information
the-djmaze committed Dec 6, 2022
1 parent c7f554d commit 08217d4
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 94 deletions.
17 changes: 13 additions & 4 deletions dev/Styles/User/AdvancedSearch.less
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
#V-PopupsAdvancedSearch {

max-width: 780px;

label {
width: 110px;
}
.span4 {
width: 360px;
}
#advancedsearchform > div {
display: inline-block;
vertical-align: top;
margin-right:1em;
}

@media screen and (max-width: 410px) {
#advancedsearchform label {
width: 100%;
}
#advancedsearchform label + * {
margin-left: 0;
}
}
174 changes: 86 additions & 88 deletions snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,108 +3,106 @@
<h3 data-i18n="SEARCH/TITLE_ADV"></h3>
</header>
<form id="advancedsearchform" class="modal-body form-horizontal" action="#/" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
<div class="row">
<div class="span4">
<div class="control-group">
<label data-i18n="GLOBAL/FROM"></label>
<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: from">
</div>
<div class="control-group">
<label data-i18n="GLOBAL/TO"></label>
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: to">
</div>
<div class="control-group">
<label data-i18n="GLOBAL/SUBJECT"></label>
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: subject">
</div>
<div class="control-group">
<label data-i18n="SEARCH/TEXT"></label>
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: text">
</div>
<!-- ko if: showKeywords -->
<div class="control-group">
<label data-i18n="SEARCH/KEYWORD"></label>
<div data-bind="component: {
name: 'Select',
params: {
options: keywords,
value: keyword,
optionsText: 'label',
optionsValue: 'value'
}
}"></div>
</div>
<!-- /ko -->
<div>
<div class="control-group">
<label data-i18n="GLOBAL/FROM"></label>
<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: from">
</div>
<div class="control-group">
<label data-i18n="GLOBAL/TO"></label>
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: to">
</div>
<div class="span4">
<div class="control-group">
<label data-i18n="SEARCH/DATE"></label>
<div class="control-group">
<label data-i18n="GLOBAL/SUBJECT"></label>
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: subject">
</div>
<div class="control-group">
<label data-i18n="SEARCH/TEXT"></label>
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
data-bind="value: text">
</div>
<!-- ko if: showKeywords -->
<div class="control-group">
<label data-i18n="SEARCH/KEYWORD"></label>
<div data-bind="component: {
name: 'Select',
params: {
options: keywords,
value: keyword,
optionsText: 'label',
optionsValue: 'value'
}
}"></div>
</div>
<!-- /ko -->
</div>
<div>
<div class="control-group">
<label data-i18n="SEARCH/DATE"></label>
<div data-bind="component: {
name: 'Select',
params: {
options: selectedDates,
value: selectedDateValue,
optionsText: 'name',
optionsValue: 'id'
}
}"></div>
</div>
<div class="control-group">
<label data-i18n="SEARCH/REPLIED"></label>
<div data-bind="component: {
name: 'Select',
params: {
options: repliedOptions,
value: repliedValue,
optionsText: 'name',
optionsValue: 'id'
}
}"></div>
</div>
<!-- ko if: showMultisearch -->
<div class="control-group">
<label data-i18n="SEARCH/SUBFOLDERS"></label>
<div data-bind="component: {
name: 'Select',
params: {
options: selectedTree,
value: selectedTreeValue,
optionsText: 'name',
optionsValue: 'id'
}
}"></div>
</div>
<!-- /ko -->
<div class="control-group">
<label></label>
<div>
<div data-bind="component: {
name: 'Select',
name: 'Checkbox',
params: {
options: selectedDates,
value: selectedDateValue,
optionsText: 'name',
optionsValue: 'id'
label: 'SEARCH/UNSEEN',
value: unseen
}
}"></div>
</div>
<div class="control-group">
<label data-i18n="SEARCH/REPLIED"></label>
<div data-bind="component: {
name: 'Select',
name: 'Checkbox',
params: {
options: repliedOptions,
value: repliedValue,
optionsText: 'name',
optionsValue: 'id'
label: 'SEARCH/FLAGGED',
value: starred
}
}"></div>
</div>
<!-- ko if: showMultisearch -->
<div class="control-group">
<label data-i18n="SEARCH/SUBFOLDERS"></label>
<div data-bind="component: {
name: 'Select',
name: 'Checkbox',
params: {
options: selectedTree,
value: selectedTreeValue,
optionsText: 'name',
optionsValue: 'id'
label: 'SEARCH/HAS_ATTACHMENT',
value: hasAttachment
}
}"></div>
</div>
<!-- /ko -->
<div class="control-group">
<label></label>
<div>
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'SEARCH/UNSEEN',
value: unseen
}
}"></div>
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'SEARCH/FLAGGED',
value: starred
}
}"></div>
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'SEARCH/HAS_ATTACHMENT',
value: hasAttachment
}
}"></div>
</div>
</div>
</div>
</div>
</form>
Expand Down
3 changes: 1 addition & 2 deletions vendors/bootstrap/less/forms.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ input {
padding: 4px 6px;
color: var(--input-clr, #555);
border-radius: var(--input-border-radius, 3px);
width: 210px;
}

textarea,
Expand All @@ -53,7 +54,6 @@ input {
border: 1px solid var(--input-border-clr, #ccc);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
transition: border linear .2s, box-shadow linear .2s;
width: 210px;

// Focus state
&:focus {
Expand Down Expand Up @@ -87,7 +87,6 @@ select, .select {
border: 1px solid var(--input-border-clr, #ccc);
cursor: pointer;
padding-right: 1.5em;
width: 223px; // default input width + 10px of padding that doesn't get applied
}

// Focus for select, file, radio, and checkbox
Expand Down

0 comments on commit 08217d4

Please sign in to comment.