Skip to content

Commit 24f03a0

Browse files
authored
Merge pull request #1769 from pom2ter/mobile-filters
fix(frontend): change incorrect colors of some input fields
2 parents ef21916 + 6dfde27 commit 24f03a0

File tree

7 files changed

+18
-14
lines changed

7 files changed

+18
-14
lines changed

modules/calendar/modules.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected function output() {
232232
$out = new Hm_Cal_Output($this, $events);
233233
$out = $out->output($data, $date, $view);
234234
return '<div class="calendar p-0"><div class="content_title d-flex justify-content-between px-3"><span class="calendar_content_title">'.$this->trans('Calendar').'</span>'.
235-
'<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm">'.
235+
'<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm text-decoration-none">'.
236236
'<i class="bi bi-plus-circle me-2"></i> '.$this->trans('Add Event').'</a></div>'.
237237
$out.'</div>';
238238
}

modules/core/site.css

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,7 @@ div.unseen,
829829
background-color: var(--bs-secondary-bg);
830830
bottom: 0px;
831831
right: 0px;
832-
padding: 20px;
833-
padding-left: 20px;
832+
padding: 10px 20px;
834833
z-index: 1000;
835834
}
836835
.long_session {
@@ -1039,7 +1038,7 @@ div.unseen,
10391038
font-size: 115%;
10401039
padding-left: 5px;
10411040
top: 0px;
1042-
left: 60px !important;
1041+
left: 50px !important;
10431042
}
10441043
@media (orientation: landscape) {
10451044
.mobile .msg_controls {
@@ -1426,7 +1425,7 @@ div.unseen,
14261425
z-index: 1000;
14271426
text-align: left;
14281427
top: 0;
1429-
padding: 10px 0 10px 20px;
1428+
padding: 10px 0 10px 18px;
14301429
background: #fff;
14311430
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
14321431
backdrop-filter: blur(10px);
@@ -1473,7 +1472,7 @@ div.unseen,
14731472
backdrop-filter: none;
14741473
width: fit-content;
14751474
margin-left: 0;
1476-
padding: 10px 20px;
1475+
padding: 10px 15px;
14771476
display: block !important;
14781477
}
14791478

@@ -1642,6 +1641,11 @@ pre.msg_source {
16421641
font-weight: bold;
16431642
}
16441643

1644+
.form-check-input:checked {
1645+
background-color: var(--bs-primary);
1646+
border-color: var(--bs-primary);
1647+
}
1648+
16451649
/* Mobile responsive overrides for Bootstrap classes */
16461650
@media (max-width: 767.98px) {
16471651
.small_header {

modules/github/modules.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ protected function output() {
715715
$limit = $settings['github_limit'];
716716
}
717717
return '<tr class="github_all_setting"><td><label for="github_limit">'.$this->trans('Max Github notices per repository').'</label></td>'.
718-
'<td class="d-flex"><input type="text" id="github_limit" name="github_limit" size="2" value="'.$this->html_safe($limit).'" data-default-value="'.DEFAULT_GITHUB_PER_SOURCE.'"/></td></tr>';
718+
'<td class="d-flex"><input type="text" class="form-control form-control-sm w-auto" id="github_limit" name="github_limit" size="2" value="'.$this->html_safe($limit).'" data-default-value="'.DEFAULT_GITHUB_PER_SOURCE.'"/></td></tr>';
719719
}
720720
}
721721

modules/nux/modules.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ protected function output() {
582582
}
583583
$res = '<div class="nux_welcome mt-3 col-lg-6 col-md-5 col-sm-12"><div class="card"><div class="card-body"><div class="card-title"><h4>'.$this->trans('Welcome to Cypht').'</h4></div>';
584584
$res .= '<div class="mb-3"><p>'.$this->trans('Add a popular E-mail source quickly and easily').'</p>';
585-
$res .= '<a class="mt-3 btn btn-light text-deocration-none" href="?page=servers#quick_add_section"><i class="bi bi-person-plus me-3"></i>'.$this->trans('Add an E-mail Account').'</a>';
585+
$res .= '<a class="mt-3 btn btn-light text-decoration-none" href="?page=servers#quick_add_section"><i class="bi bi-person-plus me-3"></i>'.$this->trans('Add an E-mail Account').'</a>';
586586
$res .= '</div>';
587587
return $res;
588588
}

modules/sievefilters/functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function get_mailbox_filters($mailbox, $site_config, $user_config)
161161
<span class="form-switch">
162162
<input script_name_parsed="'.$parsed_name.'" priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'" class="toggle_filter form-check-input" type="checkbox" role="switch" id="Check" name="script_state"'.$checked.'>
163163
</span>
164-
<a href="#" script_name_parsed="'.$parsed_name.'" priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'" class="edit_'.$base_class.'">
164+
<a href="#" script_name_parsed="'.$parsed_name.'" priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'" class="edit_'.$base_class.' ps-2">
165165
<i class="bi bi-pencil-fill"></i>
166166
</a>
167167
<a href="#" script_name_parsed="'.$parsed_name.'" priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'" class="delete_'.$base_class.' ps-2">

modules/sievefilters/modules.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ protected function output() {
11671167
$socked_connected = $this->get('socket_connected', false);
11681168
$res = '<div class="sievefilters_settings p-0"><div class="content_title px-3">'.$this->trans('Filters').'</div>';
11691169
$res .= '<div class="p-3">';
1170-
$res .= '<div class="p-3" id="sieve_accounts"></div>';
1170+
$res .= '<div id="sieve_accounts"></div>';
11711171
$res .= get_classic_filter_modal_content();
11721172
$res .= get_script_modal_content();
11731173
return $res;

modules/tags/output_modules.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected function output() {
117117
// Generate the tree view HTML
118118
$treeViewHtml = generate_tree_view($folderTree, $this->html_safe(Hm_Request_Key::generate()));
119119
$treeContent = count($folderTree) > 0 ? $treeViewHtml : '<p>'. $this->trans('No tags available yet.') .'</p>';
120-
$out = '<div class="tags_tree mt-3 col-lg-8 col-md-8 col-sm-12">
120+
$out = '<div class="tags_tree mt-3 col-lg-8 col-md-12 col-sm-12">
121121
<div class="card m-3 mr-0">
122122
<div class="card-body">
123123
<div class="tree-view">
@@ -151,9 +151,9 @@ protected function output() {
151151
$option_selected = !is_null($id) && $folder['id'] === $parent_tag ? 'selected' : '';
152152
$options .= '<option '. $option_selected.' value="'.$this->html_safe($folder['id']).'">'.$this->html_safe($folder['name']).'</option>';
153153
}
154-
$form_title = !is_null($id) ? $this->trans('Edit tag/label').': '.$tag['name'] : $this->trans('Add an tag/label');
155-
return '<div class="tags_tree mt-3 col-lg-4 col-md-4 col-sm-12">
156-
<div class="card m-4">
154+
$form_title = !is_null($id) ? $this->trans('Edit tag/label').': '.$tag['name'] : $this->trans('Add a tag/label');
155+
return '<div class="tags_tree mt-3 col-lg-4 col-md-8 col-sm-12">
156+
<div class="card m-3">
157157
<div class="card-body">
158158
<form class="add_tag me-0" method="POST" action="?page=tags">
159159
<input type="hidden" name="hm_page_key" id="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />

0 commit comments

Comments
 (0)