diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index 5d7b71c7602d3abcd594c513931f687b9ef5fe2f..8798ddf127eadf702755fa43398690d24d70f362 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -71,8 +71,6 @@ module AspectGlobalHelper str = <<LISTITEM <li data-aspect_id=#{aspect.id} class='#{klass}'> - <img src='/images/icons/check_yes_ok.png' width=18 height=18 class='check'/> - <img src='/images/icons/check_yes_ok_white.png' width=18 height=18 class='checkWhite'/> #{aspect.name} </li> LISTITEM diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index ccbbc4b80409a6483171d0c285d2647aacba878d..8066892e3f39a6a0f556d7b987943bbe06349f99 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -11,7 +11,6 @@ var ContactEdit = { processClick: function(li, evt){ var dropdown = li.closest('.dropdown'); - if (dropdown.hasClass('inviter')) { ContactEdit.inviteFriend(li, evt); } @@ -42,9 +41,8 @@ var ContactEdit = { "person_id": li.parent().data("person_id"), "_method": (selected) ? "DELETE" : "POST" }, function(aspectMembership) { - ContactEdit.toggleCheckbox(checkbox); + li.toggleClass("selected"); ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length); - Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").parent(".right").html()]); }); }, @@ -70,11 +68,6 @@ var ContactEdit = { button.html(replacement + ' â–¼'); }, - - toggleCheckbox: - function(check){ - check.parent('li').toggleClass('selected'); - } }; $(document).ready(function(){ diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index a5b9eaaa114f7531ac5b4bfac0a07d248e8cec54..2d3a25a15ce5b38321a28437670c0992c82d849f 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -136,15 +136,17 @@ :position relative :color #222 - .check, - .checkWhite - :position absolute - :left 4px - :top 1px - - .checkWhite - :display none - :top 0px + &.selected + :background + :image url('/images/icons/check_yes_ok.png') + :position 3px 1px + :repeat no-repeat + + &.selected:hover + :background + :image url('/images/icons/check_yes_ok_white.png') + /* bump top position up 1px to compensate for the 1px added top border */ + :position 3px 0px &.newItem a @@ -154,10 +156,6 @@ &:hover :text-decoration none - &:not(.selected) - .check - :display none - &.hang_right .wrapper @include border-radius(3px, 0, 3px, 3px) @@ -180,9 +178,13 @@ .selected :font-weight bold + .button + :background #666 + .button, .wrapper ul > li:hover - :background #666 + :background + :color #666 :color #fff :text-shadow none @@ -202,10 +204,3 @@ .wrapper ul > li * :cursor pointer - .selected:hover .checkWhite - :display block - - .selected:hover .check - :display none - -