diff options
| -rw-r--r-- | client/css/main.styl | 2 | ||||
| -rw-r--r-- | client/css/posts.styl | 5 | ||||
| -rw-r--r-- | client/html/comment.tpl | 4 | ||||
| -rw-r--r-- | client/html/comment_form.tpl | 4 | ||||
| -rw-r--r-- | client/html/fav.tpl | 4 | ||||
| -rw-r--r-- | client/html/post_readonly_sidebar.tpl | 8 | ||||
| -rw-r--r-- | client/html/posts_header.tpl | 4 | ||||
| -rw-r--r-- | client/html/score.tpl | 4 | ||||
| -rw-r--r-- | client/html/tag_categories.tpl | 2 | ||||
| -rw-r--r-- | client/html/tag_category_row.tpl | 4 | ||||
| -rw-r--r-- | client/js/controls/auto_complete_control.js | 1 | ||||
| -rw-r--r-- | client/js/controls/tag_input_control.js | 5 |
12 files changed, 22 insertions, 25 deletions
diff --git a/client/css/main.styl b/client/css/main.styl index 0907caa..2743525 100644 --- a/client/css/main.styl +++ b/client/css/main.styl @@ -38,11 +38,13 @@ th font-weight: normal a + cursor: pointer color: $main-color text-decoration: none transition: color 0.1s linear &.inactive color: $inactive-link-color + cursor: default &.icon color: $inactive-link-color opacity: .5 diff --git a/client/css/posts.styl b/client/css/posts.styl index 805a54e..791dfb6 100644 --- a/client/css/posts.styl +++ b/client/css/posts.styl @@ -30,8 +30,8 @@ $safety-unsafe = #F3985F text-align: center vertical-align: middle transition: background 0.2s linear - a:hover - background: lighten($main-color, 90%) + &:not(.inactive):hover + background: lighten($main-color, 90%) i font-size: 140% text-align: center @@ -107,7 +107,6 @@ $safety-unsafe = #F3985F padding: 0.5em box-sizing: border-box border: 0 - cursor: pointer &:after display: inline-block width: 1em diff --git a/client/html/comment.tpl b/client/html/comment.tpl index da91a03..8cae159 100644 --- a/client/html/comment.tpl +++ b/client/html/comment.tpl @@ -32,13 +32,13 @@ --><span class='score-container'></span><!-- --><% if (ctx.canEditComment) { %><!-- - --><a class='edit' href='#'><!-- + --><a class='edit'><!-- --><i class='fa fa-pencil'></i> edit<!-- --></a><!-- --><% } %><!-- --><% if (ctx.canDeleteComment) { %><!-- - --><a class='delete' href='#'><!-- + --><a class='delete'><!-- --><i class='fa fa-remove'></i> delete<!-- --></a><!-- --><% } %><!-- diff --git a/client/html/comment_form.tpl b/client/html/comment_form.tpl index 87e0c50..269805b 100644 --- a/client/html/comment_form.tpl +++ b/client/html/comment_form.tpl @@ -16,8 +16,8 @@ <nav class='buttons'> <ul> - <li class='preview'><a href='#'>Preview</a></li> - <li class='edit'><a href='#'>Edit</a></li> + <li class='preview'><a>Preview</a></li> + <li class='edit'><a>Edit</a></li> </ul> </nav> diff --git a/client/html/fav.tpl b/client/html/fav.tpl index d0f9664..d97333f 100644 --- a/client/html/fav.tpl +++ b/client/html/fav.tpl @@ -1,9 +1,9 @@ <% if (ctx.canFavorite) { %> <% if (ctx.ownFavorite) { %> - <a class='remove-favorite' href='#'> + <a class='remove-favorite'> <i class='fa fa-heart'></i> <% } else { %> - <a class='add-favorite' href='#'> + <a class='add-favorite'> <i class='fa fa-heart-o'></i> <% } %> <% } else { %> diff --git a/client/html/post_readonly_sidebar.tpl b/client/html/post_readonly_sidebar.tpl index 61c701b..a4b0eb0 100644 --- a/client/html/post_readonly_sidebar.tpl +++ b/client/html/post_readonly_sidebar.tpl @@ -26,10 +26,10 @@ </section> <section class='zoom'> - <a class='fit-original' href='#'>Original zoom</a> · - <a class='fit-width' href='#'>fit width</a> · - <a class='fit-height' href='#'>height</a> · - <a class='fit-both' href='#'>both</a> + <a class='fit-original'>Original zoom</a> · + <a class='fit-width'>fit width</a> · + <a class='fit-height'>height</a> · + <a class='fit-both'>both</a> </section> <section class='search'> diff --git a/client/html/posts_header.tpl b/client/html/posts_header.tpl index a1af737..431a471 100644 --- a/client/html/posts_header.tpl +++ b/client/html/posts_header.tpl @@ -12,11 +12,11 @@ <% if (ctx.parameters.tag) { %> <span class='append'>Tagging with:</span> <% } else { %> - <a class='mousetrap button append open-masstag' href='#'>Mass tag</a> + <a class='mousetrap button append open-masstag'>Mass tag</a> <% } %> <%= ctx.makeTextInput({name: 'masstag', value: ctx.parameters.tag}) %> <input class='mousetrap start-tagging' type='submit' value='Start tagging'/> - <a class='mousetrap button append stop-tagging' href='#'>Stop tagging</a> + <a class='mousetrap button append stop-tagging'>Stop tagging</a> </form> <% } %> </div> diff --git a/client/html/score.tpl b/client/html/score.tpl index 3ceee16..3641ce3 100644 --- a/client/html/score.tpl +++ b/client/html/score.tpl @@ -1,5 +1,5 @@ <% if (ctx.canScore) { %> - <a class='upvote' href='#'> + <a class='upvote'> <% if (ctx.ownScore == 1) { %> <i class='fa fa-thumbs-up'></i> <% } else { %> @@ -15,7 +15,7 @@ <% } %> <span class='value'><%- ctx.score %></span> <% if (ctx.canScore) { %> - <a class='downvote' href='#'> + <a class='downvote'> <% if (ctx.ownScore == -1) { %> <i class='fa fa-thumbs-down'></i> <% } else { %> diff --git a/client/html/tag_categories.tpl b/client/html/tag_categories.tpl index e835291..f39f4d6 100644 --- a/client/html/tag_categories.tpl +++ b/client/html/tag_categories.tpl @@ -14,7 +14,7 @@ </table> <% if (ctx.canCreate) { %> - <p><a href='#' class='add'>Add new category</a></p> + <p><a class='add'>Add new category</a></p> <% } %> <div class='messages'></div> diff --git a/client/html/tag_category_row.tpl b/client/html/tag_category_row.tpl index c633464..daa3c44 100644 --- a/client/html/tag_category_row.tpl +++ b/client/html/tag_category_row.tpl @@ -29,13 +29,13 @@ <% if (ctx.tagCategory.tagCount) { %> <a class='inactive' title="Can't delete category in use">Remove</a> <% } else { %> - <a href='#'>Remove</a> + <a>Remove</a> <% } %> </td> <% } %> <% if (ctx.canSetDefault) { %> <td class='set-default'> - <a href='#'>Make default</a> + <a>Make default</a> </td> <% } %> </tr> diff --git a/client/js/controls/auto_complete_control.js b/client/js/controls/auto_complete_control.js index 2ee735c..d8bc83a 100644 --- a/client/js/controls/auto_complete_control.js +++ b/client/js/controls/auto_complete_control.js @@ -214,7 +214,6 @@ class AutoCompleteControl { let resultIndexWorkaround = resultIndex; const listItem = document.createElement('li'); const link = document.createElement('a'); - link.href = '#'; link.innerHTML = resultItem.caption; link.setAttribute('data-key', resultItem.value); link.addEventListener( diff --git a/client/js/controls/tag_input_control.js b/client/js/controls/tag_input_control.js index 99249b3..5f410f7 100644 --- a/client/js/controls/tag_input_control.js +++ b/client/js/controls/tag_input_control.js @@ -113,7 +113,7 @@ class TagInputControl extends events.EventTarget { this._suggestionsNode = views.htmlToDom( '<div class="tag-suggestions">' + '<div class="wrapper">' + - '<p>Suggested tags<a class="close" href="#">×</a></p>' + + '<p>Suggested tags<a class="close">×</a></p>' + '<ul></ul>' + '</div>' + '</div>'); @@ -316,7 +316,6 @@ class TagInputControl extends events.EventTarget { const removalLinkNode = document.createElement('a'); removalLinkNode.classList.add('append'); - removalLinkNode.setAttribute('href', '#'); removalLinkNode.setAttribute('data-pseudo-content', '×'); removalLinkNode.addEventListener('click', e => { e.preventDefault(); @@ -375,7 +374,6 @@ class TagInputControl extends events.EventTarget { const actualTag = tags.getTagByName(tagName); const addLinkNode = document.createElement('a'); addLinkNode.textContent = tagName; - addLinkNode.setAttribute('href', '#'); addLinkNode.classList.add('add-tag'); if (actualTag) { addLinkNode.classList.add( @@ -396,7 +394,6 @@ class TagInputControl extends events.EventTarget { removeLinkNode.classList.add('remove-tag'); removeLinkNode.classList.add('append'); removeLinkNode.setAttribute('data-pseudo-content', '×'); - removeLinkNode.setAttribute('href', '#'); removeLinkNode.addEventListener('click', e => { e.preventDefault(); listNode.removeChild(listItemNode); |