Skip to content

Commit

Permalink
Merge pull request #54 from TheDMSGroup/improve-room-tags
Browse files Browse the repository at this point in the history
Improve room for tags
  • Loading branch information
heathdutton authored Apr 12, 2018
2 parents 43537dc + 9a3b475 commit 8d46097
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Assets/build/contactclient.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/build/contactclient.min.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Assets/css/03.api_payload_json.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@
pointer-events: none;
}

.api_payload .contactclient_jsoneditor div[data-schemapath*=".request.body"].manual > div > table > tbody > tr > td[data-schemapath*=".value"] .tag-editor .tag-editor-tag.normal {
color: #fff;
}

.api_payload .contactclient_jsoneditor div[data-schemapath*=".request.body"].manual > div > table > tbody > tr > td[data-schemapath*=".value"] > div.form-group > ul {
background: none;
border: 0;
Expand Down
19 changes: 19 additions & 0 deletions Assets/css/09.integration.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,22 @@
border: 0;
border-radius: 0;
}
#campaignevent_properties_config .contactclient_jsoneditor div > table > tbody > tr > td {
min-width: 150px;
}

#campaignevent_properties_config .contactclient_jsoneditor {
overflow-y: auto;
}
@media (min-width: 768px) {
#CampaignEventModal .modal-dialog.expanded {
width: auto;
min-width: 600px;
max-width: 95%;
-webkit-transition: width 300ms ease-in-out;
-moz-transition: width 300ms ease-in-out;
-ms-transition: width 300ms ease-in-out;
-o-transition: width 300ms ease-in-out;
transition: width 300ms ease-in-out;
}
}
10 changes: 10 additions & 0 deletions Assets/js/09.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,15 @@ Mautic.contactclientIntegration = function () {
});
$client.addClass('contactclient-checked');
$overrides.addClass('contactclient-checked');

// Expand the modal view.
var $modal = mQuery('#CampaignEventModal:first');
if ($modal.length) {
var $dialog = $modal.find('.modal-dialog:first');
$dialog.addClass('expanded');
$modal.on('hidden.bs.modal', function(){
$dialog.removeClass('expanded');
});
}
}
};

0 comments on commit 8d46097

Please sign in to comment.