Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed some styling not necessary after bootstrap 5 integration that break themes #1232

Merged
merged 1 commit into from
Sep 9, 2024
Merged
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
1 change: 0 additions & 1 deletion modules/core/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ button {
.inner_list li {
padding: 4px;
padding-left: 10px;
color: #555;
padding-bottom: 0px;
margin: 2px;
white-space: nowrap;
Expand Down
2 changes: 2 additions & 0 deletions modules/core/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,12 @@ function Message_List() {
if ($('input[type=checkbox]', $('.message_table')).filter(function() {return this.checked; }).length > 0) {
$('.msg_controls').addClass('d-flex');
$('.msg_controls').removeClass('d-none');
$('.mailbox_list_title').addClass('hide');
}
else {
$('.msg_controls').removeClass('d-flex');
$('.msg_controls').addClass('d-none');
$('.mailbox_list_title').removeClass('hide');
}
};

Expand Down
2 changes: 1 addition & 1 deletion modules/imap/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,7 @@ $(function() {

if ($('.imap_move').length > 0) {
check_select_for_imap();
$('.toggle_link').on("click", function() { $('.mailbox_list_title').toggleClass('hide'); setTimeout(search_selected_for_imap, 100); });
$('.toggle_link').on("click", function() { setTimeout(search_selected_for_imap, 100); });
Hm_Ajax.add_callback_hook('ajax_imap_folder_display', check_select_for_imap);
Hm_Message_List.callbacks.push(check_select_for_imap);
$('.imap_move').on("click", function() { return false; });
Expand Down
2 changes: 1 addition & 1 deletion modules/imap_folders/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/* .sp_description { padding-bottom: 20px; } */
#draft_val, #sent_val, #trash_val, #junk_val { padding-left: 20px; }
.manage_folder_icon { vertical-align: -3px; opacity: .3 }
.manage_folder_link { color: #999 !important; }
.manage_folder_link { opacity: 0.6; }

.folder_subscription_btn { position: absolute; right: 20px; top: 20px; }
.folders_subscription { padding-left: 10px; width: 100%; display: inline-block; }
Expand Down
12 changes: 6 additions & 6 deletions modules/sievefilters/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ function get_classic_filter_modal_content()
<h5 class="mt-0">Conditions</h5>
</div>
<div class="flex-grow-1 text-end">
<button class="sieve_add_condition_modal_button btn btn-sm border bg-white">Add Condition</button>
<button class="sieve_add_condition_modal_button btn btn-sm border btn-primary">Add Condition</button>
</div>
</div>
<div class="d-block mt-3">
<table class="sieve_list_conditions_modal">
<div class="d-block mt-3 table-responsive">
<table class="sieve_list_conditions_modal table">
</table>
</div>
</div>
Expand All @@ -79,11 +79,11 @@ function get_classic_filter_modal_content()
<h5 class="mt-0">Actions</h5>
</div>
<div class="flex-grow-1 text-end">
<button class="filter_modal_add_action_btn btn btn-sm border bg-white">Add Action</button>
<button class="filter_modal_add_action_btn btn btn-sm border btn-primary">Add Action</button>
</div>
</div>
<div class="d-block mt-3">
<table class="filter_actions_modal_table">
<div class="d-block mt-3 table-responsive">
<table class="filter_actions_modal_table table">
</table>
</div>
</div>
Expand Down
3 changes: 0 additions & 3 deletions modules/sievefilters/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@
margin: 0;
padding: 0;
width: 100%;
table-layout: fixed;
}


Expand All @@ -277,7 +276,6 @@ table.sieve_list_conditions_modal caption {
}

table.sieve_list_conditions_modal tr {
background-color: #f8f8f8;
border: 1px solid #ddd;
padding: .35em;
}
Expand Down Expand Up @@ -332,7 +330,6 @@ table.filter_actions_modal_table caption {
}

table.filter_actions_modal_table tr {
background-color: #f8f8f8;
border: 1px solid #ddd;
padding: .35em;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/sievefilters/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ $(function () {
' <input type="text" name="sieve_selected_option_value[]" class="form-control form-control-sm" />' +
' </td>' +
' <td class="col-sm-1 text-end align-middle">' +
' <a href="#" class="delete_condition_modal_button">Delete</a>' +
' <a href="#" class="delete_condition_modal_button btn btn-sm btn-secondary">Delete</a>' +
' </td>' +
' </tr>'
);
Expand Down Expand Up @@ -686,7 +686,7 @@ $(function () {
' <input type="hidden" name="sieve_selected_action_value[]" value="">' +
' </input>' +
' <td class="col-sm-1 text-end align-middle">' +
' <a href="#" class="delete_action_modal_button">Delete</a>' +
' <a href="#" class="delete_action_modal_button btn btn-sm btn-secondary">Delete</a>' +
' </td>' +
'</tr>'
);
Expand Down