Commit e02139a4 authored by Arthur Verschaeve's avatar Arthur Verschaeve

chaplin-brunch: remove count from clear completed button

parent 0ef0bd3f
...@@ -32,7 +32,6 @@ module.exports = class FooterView extends View ...@@ -32,7 +32,6 @@ module.exports = class FooterView extends View
countDescription = (if active is 1 then 'item' else 'items') countDescription = (if active is 1 then 'item' else 'items')
@find('.todo-count-title').textContent = countDescription @find('.todo-count-title').textContent = countDescription
@find('#completed-count').textContent = "(#{completed})"
utils.toggle @find('#clear-completed'), completed > 0 utils.toggle @find('#clear-completed'), completed > 0
utils.toggle @el, total > 0 utils.toggle @el, total > 0
......
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
<a href="#/completed">Completed</a> <a href="#/completed">Completed</a>
</li> </li>
</ul> </ul>
<button id="clear-completed">Clear completed <span id="completed-count"></span></button> <button id="clear-completed">Clear completed</button>
...@@ -15,11 +15,9 @@ button { ...@@ -15,11 +15,9 @@ button {
font-weight: inherit; font-weight: inherit;
color: inherit; color: inherit;
-webkit-appearance: none; -webkit-appearance: none;
-ms-appearance: none;
appearance: none; appearance: none;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-font-smoothing: antialiased; -moz-font-smoothing: antialiased;
-ms-font-smoothing: antialiased;
font-smoothing: antialiased; font-smoothing: antialiased;
} }
...@@ -33,7 +31,6 @@ body { ...@@ -33,7 +31,6 @@ body {
margin: 0 auto; margin: 0 auto;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-font-smoothing: antialiased; -moz-font-smoothing: antialiased;
-ms-font-smoothing: antialiased;
font-smoothing: antialiased; font-smoothing: antialiased;
font-weight: 300; font-weight: 300;
} }
...@@ -83,7 +80,6 @@ input[type="checkbox"] { ...@@ -83,7 +80,6 @@ input[type="checkbox"] {
color: rgba(175, 47, 47, 0.15); color: rgba(175, 47, 47, 0.15);
-webkit-text-rendering: optimizeLegibility; -webkit-text-rendering: optimizeLegibility;
-moz-text-rendering: optimizeLegibility; -moz-text-rendering: optimizeLegibility;
-ms-text-rendering: optimizeLegibility;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
} }
...@@ -102,11 +98,9 @@ input[type="checkbox"] { ...@@ -102,11 +98,9 @@ input[type="checkbox"] {
padding: 6px; padding: 6px;
border: 1px solid #999; border: 1px solid #999;
box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2); box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
-ms-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-font-smoothing: antialiased; -moz-font-smoothing: antialiased;
-ms-font-smoothing: antialiased;
font-smoothing: antialiased; font-smoothing: antialiased;
} }
...@@ -191,7 +185,6 @@ label[for='toggle-all'] { ...@@ -191,7 +185,6 @@ label[for='toggle-all'] {
margin: auto 0; margin: auto 0;
border: none; /* Mobile Safari */ border: none; /* Mobile Safari */
-webkit-appearance: none; -webkit-appearance: none;
-ms-appearance: none;
appearance: none; appearance: none;
} }
...@@ -323,19 +316,10 @@ html #clear-completed:active { ...@@ -323,19 +316,10 @@ html #clear-completed:active {
line-height: 20px; line-height: 20px;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
visibility: hidden;
position: relative; position: relative;
} }
#clear-completed::after { #clear-completed:hover {
visibility: visible;
content: 'Clear completed';
position: absolute;
right: 0;
white-space: nowrap;
}
#clear-completed:hover::after {
text-decoration: underline; text-decoration: underline;
} }
......
...@@ -417,7 +417,6 @@ module.exports = FooterView = (function(_super) { ...@@ -417,7 +417,6 @@ module.exports = FooterView = (function(_super) {
this.find('#todo-count > strong').textContent = active; this.find('#todo-count > strong').textContent = active;
countDescription = (active === 1 ? 'item' : 'items'); countDescription = (active === 1 ? 'item' : 'items');
this.find('.todo-count-title').textContent = countDescription; this.find('.todo-count-title').textContent = countDescription;
this.find('#completed-count').textContent = "(" + completed + ")";
utils.toggle(this.find('#clear-completed'), completed > 0); utils.toggle(this.find('#clear-completed'), completed > 0);
return utils.toggle(this.el, total > 0); return utils.toggle(this.el, total > 0);
}; };
...@@ -481,7 +480,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; ...@@ -481,7 +480,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
return "<span id=\"todo-count\">\n <strong></strong>\n <span class=\"todo-count-title\">items</span>\n left\n</span>\n<ul id=\"filters\">\n <li>\n <a href=\"#/\">All</a>\n </li>\n <li>\n <a href=\"#/active\">Active</a>\n </li>\n <li>\n <a href=\"#/completed\">Completed</a>\n </li>\n</ul>\n<button id=\"clear-completed\">Clear completed <span id=\"completed-count\"></span></button>\n"; return "<span id=\"todo-count\">\n <strong></strong>\n <span class=\"todo-count-title\">items</span>\n left\n</span>\n<ul id=\"filters\">\n <li>\n <a href=\"#/\">All</a>\n </li>\n <li>\n <a href=\"#/active\">Active</a>\n </li>\n <li>\n <a href=\"#/completed\">Completed</a>\n </li>\n</ul>\n<button id=\"clear-completed\">Clear completed</button>\n";
}); });
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
define([], function() { define([], function() {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment