Skip to content

Commit c4c8033

Browse files
authored
Merge pull request #1778 from pom2ter/mobile-tweaks-3
fix(frontend): mobile tweaks to the user and site settings
2 parents 673e961 + dab451d commit c4c8033

File tree

2 files changed

+24
-31
lines changed

2 files changed

+24
-31
lines changed

modules/core/site.css

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -290,14 +290,15 @@ td {
290290
.server_content,
291291
.profile_content,
292292
.user_settings {
293+
position: relative;
293294
display: table;
294295
table-layout: fixed;
295296
width: 100%;
296297
min-height: 500px;
297298
background: #fff;
298299
height: 100%;
299300
margin-right: 20px;
300-
padding-bottom: 40px;
301+
padding-bottom: 20px;
301302
}
302303
.user_settings table {
303304
table-layout: fixed;
@@ -312,12 +313,13 @@ td {
312313
color: var(--bs-body-color);
313314
}
314315
.reset_factory_button {
316+
position: absolute;
317+
bottom: 40px;
318+
right: 10px;
319+
margin-right: 37px;
315320
cursor: pointer;
316321
color: #666;
317322
font-size: 100%;
318-
padding: 10px !important;
319-
float: right !important;
320-
margin-right: 20px;
321323
}
322324
.disabled_link {
323325
pointer-events: none;
@@ -1270,7 +1272,7 @@ div.unseen,
12701272
right: 0px;
12711273
display: none;
12721274
padding: 0px 5px 5px 10px;
1273-
background-color: #fff;
1275+
background-color: var(--bs-body-bg);
12741276
}
12751277
.mobile #list_controls_menu.show {
12761278
display: flex;
@@ -1313,7 +1315,7 @@ div.unseen,
13131315
position: absolute;
13141316
right: 0px;
13151317
top: 54px;
1316-
background-color: #fafafa;
1318+
background-color: var(--bs-body-bg);
13171319
font-size: 85%;
13181320
padding: 15px 20px;
13191321
display: none;
@@ -1355,16 +1357,6 @@ div.unseen,
13551357
.on_mobile {
13561358
display: none;
13571359
}
1358-
.mobile .no_mobile {
1359-
display: none !important;
1360-
}
1361-
.mobile .on_mobile {
1362-
display: block !important;
1363-
}
1364-
.mobile .move_to_location {
1365-
right: 0;
1366-
}
1367-
13681360
.server_title {
13691361
font-size: 110%;
13701362
margin-bottom: 0px;
@@ -1426,7 +1418,7 @@ div.unseen,
14261418
text-align: left;
14271419
top: 0;
14281420
padding: 10px 0 10px 18px;
1429-
background: #fff;
1421+
background: var(--bs-body-bg);
14301422
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
14311423
backdrop-filter: blur(10px);
14321424
}
@@ -1570,11 +1562,6 @@ a[disabled] {
15701562
color: var(--bs-white);
15711563
}
15721564

1573-
.mobile .search_content .p-3 {
1574-
flex: 1 1 auto;
1575-
overflow: auto;
1576-
}
1577-
15781565
.search_content .refresh_link {
15791566
display: none;
15801567
}
@@ -1627,11 +1614,6 @@ a[disabled] {
16271614
white-space: nowrap;
16281615
}
16291616

1630-
.mobile .folders {
1631-
margin-top: 1rem;
1632-
margin-left: 1rem !important;
1633-
}
1634-
16351617
pre.msg_source {
16361618
white-space: pre-wrap;
16371619
word-break: break-word;
@@ -1646,6 +1628,17 @@ pre.msg_source {
16461628
border-color: var(--bs-primary);
16471629
}
16481630

1631+
.mobile .no_mobile { display: none !important; }
1632+
.mobile .on_mobile { display: block !important; }
1633+
.mobile .move_to_location { right: 0; }
1634+
.mobile .search_content .p-3 { flex: 1 1 auto; overflow: auto; }
1635+
.mobile .search_form { padding-left: 0; }
1636+
.mobile .folders { margin-top: 1rem; margin-left: 1rem !important; }
1637+
.mobile .server_section { overflow: hidden; }
1638+
.mobile .add_server .txt_fld { width: 100%; }
1639+
.mobile .user_settings table td { padding: 5px 10px; }
1640+
.mobile .reset_factory_button { margin-right: 1rem; }
1641+
16491642
/* Mobile responsive overrides for Bootstrap classes */
16501643
@media (max-width: 767.98px) {
16511644
.small_header {

modules/imap/output_modules.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ protected function output() {
493493
$pass_value = '';
494494
}
495495
$res .= '<div class="' . mb_strtolower($type) . '_server mb-3">';
496-
$res .= '<form class="imap_connect" method="POST">';
496+
$res .= '<form class="imap_connect" method="POST"><div class="row">';
497497
$res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
498498
$res .= '<input type="hidden" name="imap_server_id" class="imap_server_id" value="'.$this->html_safe($server_id).'" />';
499499
$res .= '<div class="row m-0 p-0 credentials-container"><div class="col-xl-2 col-lg-2 col-md-6 overflow-auto" >';
@@ -546,7 +546,7 @@ protected function output() {
546546
$res .= '<input type="submit" '.(!$hidden ? 'style="display: none;" ' : '').'value="'.$this->trans('Unhide').'" class="unhide_imap_connection btn btn-outline-secondary btn-sm me-2 mt-3" />';
547547

548548
$res .= '<input type="hidden" value="ajax_imap_debug" name="hm_ajax_hook" />';
549-
$res .= '</div></div></div></form>';
549+
$res .= '</div></div></div></form></div>';
550550
}
551551
$res .= '';
552552
return $res;
@@ -1549,7 +1549,7 @@ protected function output() {
15491549
$pass_value = '';
15501550
}
15511551
$res .= '<div class="ews_server mt-3 mb-3">';
1552-
$res .= '<form class="imap_connect" method="POST">';
1552+
$res .= '<form class="imap_connect" method="POST"><div class="row">';
15531553
$res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
15541554
$res .= '<input type="hidden" name="imap_server_id" class="imap_server_id" value="'.$this->html_safe($server_id).'" />';
15551555
$res .= '<div class="row m-0 p-0 credentials-container"><div class="col-xl-2 col-lg-2 col-md-6">';
@@ -1591,7 +1591,7 @@ protected function output() {
15911591
$res .= '<input type="submit" '.(!$hidden ? 'style="display: none;" ' : '').'value="'.$this->trans('Unhide').'" class="unhide_imap_connection btn btn-outline-secondary btn-sm me-2" />';
15921592

15931593
$res .= '<input type="hidden" value="ajax_imap_debug" name="hm_ajax_hook" />';
1594-
$res .= '</div></div></div></form>';
1594+
$res .= '</div></div></div></form></div>';
15951595
}
15961596

15971597
$res .= '

0 commit comments

Comments
 (0)