Skip to content

Commit

Permalink
Merge pull request #740 from josaphatim/fixed-cypht-integration-class…
Browse files Browse the repository at this point in the history
…-issue

Renamed dropdown css class to not interfere with framework class when cypht is embedded
  • Loading branch information
marclaporte committed Aug 12, 2023
2 parents b4d9047 + 0822c93 commit c55313b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions modules/imap/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
.attached_image { margin-right: 20px; margin-bottom: 20px; height: 200px; }
.attached_image_box { display: flex; flex-wrap: wrap; border-top: solid 1px #ddd; padding-top: 20px; padding-left: 20px; width: 100%; padding-bottom: 40px; }
.list_meta { float: none; margin-left: 37%; }
.dropdown { display: none; position: absolute; margin-top: 15px; background-color: #fff; border: 1px solid #ddd; box-shadow: 3px 3px 3px #ddd; font-variant: none; min-width: 250px; }
.dropdown a { padding: 8px; padding-left: 15px !important; padding-right: 15px !important; white-space: nowrap; font-size: 1rem; display: block !important; margin-right: 0; border: 0; cursor: pointer; }
.dropdown a:hover { background-color: #eee; }
.cypht-dropdown { display: none; position: absolute; margin-top: 15px; background-color: #fff; border: 1px solid #ddd; box-shadow: 3px 3px 3px #ddd; font-variant: none; min-width: 250px; }
.cypht-dropdown a { padding: 8px; padding-left: 15px !important; padding-right: 15px !important; white-space: nowrap; font-size: 1rem; display: block !important; margin-right: 0; border: 0; cursor: pointer; }
.cypht-dropdown a:hover { background-color: #eee; }
2 changes: 1 addition & 1 deletion modules/sievefilters/modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,7 @@ function block_filter($filter, $user_config, $action, $imap_server_id, $sender,

if (!hm_exists('block_filter_dropdown')) {
function block_filter_dropdown($mod, $with_scope = true, $submit_id = 'block_sender', $submit_title = 'Block') {
$ret = '<div class="dropdown">'
$ret = '<div class="cypht-dropdown">'
.'<form id="block_sender_form">';
if ($with_scope) {
$ret .= '<div><label>'.$mod->trans('Who Is Blocked').'</label>'
Expand Down
4 changes: 2 additions & 2 deletions modules/sievefilters/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ $(function () {
let sender = $(this).closest('tr').children().first().html();
let scope = sender.startsWith('*@') ? 'domain': 'sender';

$('.dropdown').toggle();
$('.cypht-dropdown').toggle();
Hm_Ajax.request(
[
{'name': 'hm_ajax_hook', 'value': 'ajax_sieve_block_unblock'},
Expand All @@ -261,7 +261,7 @@ $(function () {
$(document).on('click', '.toggle-behavior-dropdown', function(e) {
e.preventDefault();
var default_val = $(this).data('action');
$('.dropdown').insertAfter(this).toggle();
$('.cypht-dropdown').insertAfter(this).toggle();
$('#block_sender_form').trigger('reset');
$('#reject_message').remove();
$('#block_action').val(default_val).trigger('change');
Expand Down

0 comments on commit c55313b

Please sign in to comment.