Browse files

Another UI update

  • Loading branch information...
1 parent ad5cc2f commit 1ecf7d1bc7645e91759007b87c23527f7eaa40cf @stefancrain stefancrain committed Jan 25, 2013
Showing with 14 additions and 10 deletions.
  1. +12 −8 modules/nyss_imapper/nyss_imapper.css
  2. +2 −2 modules/nyss_imapper/nyss_imapper.js
View
20 modules/nyss_imapper/nyss_imapper.css
@@ -37,7 +37,7 @@
.contactList .contactItem.hover {background:#ff8;}
.contactList .contactItem.active.hover {background:#f96;}
.contactList .contactItem input {float:left;margin:5px;}
-.contactList .contactItem .left {float:left; cursor:pointer;}
+.contactList .contactItem .left {float:left; }
.contactList .contactItem .left div {font-size:10px;}
.contactList .contactItem .right {float:right; margin-top:5px;}
.find-match-popup, .delete-confirm{ display: none;}
@@ -53,9 +53,13 @@
.date{width: 100px !important; overflow: hidden; display: block; height: 32px;}
.date span{float: left; margin: 8px 0;}
.checkbox_switch{ margin-left: 10px;}
-#Activities .Actions{ width:155px !important;}
-#Unmatched .Actions{ width:110px !important;}
+#Activities .actions{ width:155px !important; overflow: hidden; display: block; height: 32px ; float: left;}
+#Unmatched .actions{ width:110px !important; overflow: hidden; display: block; height: 32px; float: left;}
+#Activities .actions span a, #Unmatched .actions span a{float: left; margin: 8px 1px 8px 0; padding: 2px 4px; border-radius: 3px;}
+.actions a:hover{background: #fff; }
.delete a{color:red !important;}
+.delete a:hover{background: #ff9999; }
+
#autocomplete_tag,.autocomplete-tags-bank{ width: 464px; padding: 10px 4px; margin: 0 0 10px 0; float:left;}
#autocomplete-tags-bank{ padding:0px; }
a.tag-item { color: #666!important;}
@@ -88,17 +92,17 @@ a.tag-selected:hover { color: #fff!important; background-color: red; }
#message_left_email{ padding:10px ;width:640px; height:340px; overflow:auto; }
#message_left_email.crmdev,#message_left_email.crmtest{height: 320px;}
-#message_right{ width:285px; float:left; border-left: 1px solid #ccc; padding:0 0 0 10px; height:455px;}
+#message_right{ width:275px; float:left; border-left: 1px solid #ccc; padding:0 0 0 10px; height:470px;}
#find-match-popup .ui-tabs-panel { padding:0;}
/*.first_name,.last_name {width:46%;}*/
.hidden{display:none;}
#assign_container {padding-left: 100px;}
#imapper-messages {scrollbar: always;overflow: auto;height: 600px;float: left;}
.imapper-message-box {background-color: #eeeeee;margin: 2px; height:40px;}
-.imapper-message-box:hover {cursor: pointer;background-color: #e8eaeb!important;}
+.imapper-message-box:hover { background-color: #e8eaeb!important;}
.imapper-message-box .imapper-select-button {padding-top: 0px;}
.imapper-contact-box {background-color: #f8f8f8;margin-bottom: 4px;padding: 4px 0;float:left;}
-.imapper-contact-box:hover {cursor: pointer; background-color: #eeeeee}
+.imapper-contact-box:hover { background-color: #eeeeee}
.imapper-address-select-box {height: 16px;width: 20px;float: left;padding: 15px 0px;}
.imapper-address-box {float: left;width: 230px;padding-left: 5px;}
.clear {clear: both;}
@@ -130,8 +134,8 @@ a.tag-selected:hover { color: #fff!important; background-color: red; }
}
.imapper-message-box td { vertical-align: middle!important; }
#message_right label{float: left;display: block;}
-.label_def{width: 100px;font-weight: bold;float: left;margin: 0.4em 0 0.02em;}
-#message_right label input {width: 165px; }
+.label_def{width: 110px;font-weight: bold;float: left;margin: 0.4em 0 0.02em;}
+#message_right label input {width: 145px; }
#tagging #BBTreeContainer .BBTree, #BBDialog .BBTree{height: 200px; width: 250px; float: left;}
.loading_message{ margin: 0px auto; background: #fff; padding:5px; width: 200px}
.popup_def{ color: #777777;
View
4 modules/nyss_imapper/nyss_imapper.js
@@ -983,7 +983,7 @@ function buildMessageList() {
messagesHtml += '<td class="forwarder"> N/A </td>';
}
- messagesHtml += '<td class="Actions"><span class="find_match"><a href="#">Find match</a></span> | <span class="delete"><a href="#">Delete</a></span></td> </tr>';
+ messagesHtml += '<td class="actions"><span class="find_match"><a href="#">Find match</a></span><span class="delete"><a href="#">Delete</a></span></td> </tr>';
}
});
cj('#imapper-messages-list').html(messagesHtml);
@@ -1023,7 +1023,7 @@ function buildActivitiesList() {
messagesHtml += '<td class="subject">'+short_subject(value.subject,40) +'</td>';
messagesHtml += '<td class="date"><span data="'+value.date_u+'">'+value.date +'</span></td>';
messagesHtml += '<td class="forwarder">'+short_subject(value.forwarder,14)+'</td>';
- messagesHtml += '<td class="Actions"> <span class="edit_match"><a href="#">Edit</a></span> | <span class="add_tag"><a href="#">Tag</a></span> | <span class="clear_activity"><a href="#">Clear</a></span> | <span class="delete"><a href="#">Delete</a></span></td> </tr>';
+ messagesHtml += '<td class="actions"><span class="edit_match"><a href="#">Edit</a></span><span class="add_tag"><a href="#">Tag</a></span><span class="clear_activity"><a href="#">Clear</a></span><span class="delete"><a href="#">Delete</a></span></td> </tr>';
}
});
cj('#imapper-messages-list').html(messagesHtml);

0 comments on commit 1ecf7d1

Please sign in to comment.