Skip to content

Commit

Permalink
Merge pull request aehlke#29 from andrusha/master
Browse files Browse the repository at this point in the history
Renamed .close to .tagit-close
  • Loading branch information
aehlke committed Sep 5, 2011
2 parents 00d7a4a + c461975 commit 396745e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions css/jquery.tagit.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ul.tagit li.tagit-choice a.tagit-label {
cursor: pointer;
text-decoration: none;
}
ul.tagit li.tagit-choice .close {
ul.tagit li.tagit-choice .tagit-close {
cursor: pointer;
position: absolute;
right: .1em;
Expand All @@ -31,7 +31,7 @@ ul.tagit li.tagit-choice .close {
}

/* used for some custom themes that don't need image icons */
ul.tagit li.tagit-choice .close .text-icon {
ul.tagit li.tagit-choice .tagit-close .text-icon {
display: none;
}

Expand Down
8 changes: 4 additions & 4 deletions css/tagit.ui-zendesk.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ ul.tagit li.tagit-choice {
color: #555;
font-weight: normal;
}
ul.tagit li.tagit-choice a.close {
ul.tagit li.tagit-choice a.tagit-close {
text-decoration: none;
}
ul.tagit li.tagit-choice .close {
ul.tagit li.tagit-choice .tagit-close {
right: .4em;
}
ul.tagit li.tagit-choice .ui-icon {
display: none;
}
ul.tagit li.tagit-choice .close .text-icon {
ul.tagit li.tagit-choice .tagit-close .text-icon {
display: inline;
font-family: arial, sans-serif;
font-size: 16px;
Expand All @@ -41,7 +41,7 @@ ul.tagit li.tagit-choice:hover, ul.tagit li.tagit-choice.remove {
border-color: #6d95e0;
}
ul.tagit li.tagit-choice a.tagLabel:hover,
ul.tagit li.tagit-choice a.close .text-icon:hover {
ul.tagit li.tagit-choice a.tagit-close .text-icon:hover {
color: #222;
}
ul.tagit input[type="text"] {
Expand Down
2 changes: 1 addition & 1 deletion js/tag-it.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
var removeTagIcon = $('<span></span>')
.addClass('ui-icon ui-icon-close');
var removeTag = $('<a><span class="text-icon">\xd7</span></a>') // \xd7 is an X
.addClass('close')
.addClass('tagit-close')
.append(removeTagIcon)
.click(function(e) {
// Removes a tag when the little 'x' is clicked.
Expand Down

0 comments on commit 396745e

Please sign in to comment.