Commit 28deda76 authored by Aaron Boushley's avatar Aaron Boushley

Merge branch 'master' of https://github.com/addyosmani/todomvc

parents aab10219 d9f25d7c
...@@ -240,7 +240,7 @@ html { ...@@ -240,7 +240,7 @@ html {
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats .todo-clear a:hover { #todoapp #todo-stats .todo-clear a:hover, #todoapp #todo-stats .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
...@@ -255,7 +255,7 @@ html { ...@@ -255,7 +255,7 @@ html {
#todo-stats .todo-clear a:visited { #todo-stats .todo-clear a:visited {
color: #777777; color: #777777;
} }
#todo-stats .todo-clear a:hover { #todo-stats .todo-clear a:hover, #todo-stats .todo-clear a:focus {
color: #336699; color: #336699;
} }
...@@ -286,6 +286,7 @@ html { ...@@ -286,6 +286,7 @@ html {
* Fran�ois 'cahnory' Germain * Fran�ois 'cahnory' Germain
*/ */
.ui-tooltip, .ui-tooltip-top, .ui-tooltip-right, .ui-tooltip-bottom, .ui-tooltip-left { .ui-tooltip, .ui-tooltip-top, .ui-tooltip-right, .ui-tooltip-bottom, .ui-tooltip-left {
position:absolute;
color:#ffffff; color:#ffffff;
cursor:normal; cursor:normal;
display:-moz-inline-stack; display:-moz-inline-stack;
......
...@@ -240,7 +240,7 @@ html { ...@@ -240,7 +240,7 @@ html {
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats .todo-clear a:hover { #todoapp #todo-stats .todo-clear a:hover, #todoapp #todo-stats .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
...@@ -255,7 +255,7 @@ html { ...@@ -255,7 +255,7 @@ html {
#todo-stats .todo-clear a:visited { #todo-stats .todo-clear a:visited {
color: #777777; color: #777777;
} }
#todo-stats .todo-clear a:hover { #todo-stats .todo-clear a:hover, #todo-stats .todo-clear a:focus {
color: #336699; color: #336699;
} }
......
...@@ -517,7 +517,7 @@ body { ...@@ -517,7 +517,7 @@ body {
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats .todo-clear a:hover { #todoapp #todo-stats .todo-clear a:hover, #todoapp #todo-stats .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -149,7 +149,7 @@ body { ...@@ -149,7 +149,7 @@ body {
cursor: pointer; cursor: pointer;
} }
#tasks .clear:hover { #tasks .clear:hover, #tasks .clear:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -305,7 +305,7 @@ body { ...@@ -305,7 +305,7 @@ body {
color: #777777; color: #777777;
} }
#todo-stats .todo-clear a:hover { #todo-stats .todo-clear a:hover {
color: #336699; color: 336699;
} }
#instructions { #instructions {
...@@ -401,7 +401,7 @@ body { ...@@ -401,7 +401,7 @@ body {
border:0px; border:0px;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats button:hover { #todoapp #todo-stats button:hover, #todoapp #todo-stats button:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
{! } !} {! } !}
{! if (done) { !} {! if (done) { !}
<span class="todo-clear"> <span class="todo-clear">
<a data-action="clearCompleted"> <a data-action="clearCompleted" href="#">
Clear <span class="number-done">{!= done !}</span> Clear <span class="number-done">{!= done !}</span>
completed <span class="word-done">{!= done == 1 ? 'item' : 'items' !}</span> completed <span class="word-done">{!= done == 1 ? 'item' : 'items' !}</span>
</a> </a>
......
...@@ -517,7 +517,7 @@ body { ...@@ -517,7 +517,7 @@ body {
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats .todo-clear a:hover { #todoapp #todo-stats .todo-clear a:hover, #todoapp #todo-stats .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -150,6 +150,13 @@ ul { ...@@ -150,6 +150,13 @@ ul {
-o-box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; -o-box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
.todo-clear a:hover, .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15);
}
#todoapp #todo-stats .todo-clear a:active {
position: relative;
top: 1px;
}
#credits { #credits {
......
...@@ -187,10 +187,11 @@ body { ...@@ -187,10 +187,11 @@ body {
color: #777777; color: #777777;
font-size: 12px; font-size: 12px;
} }
/* these two rules are overridden below. find ".todo-clear a" */
#todo-stats .todo-clear a:visited { #todo-stats .todo-clear a:visited {
color: #777777; color: #777777;
} }
#todo-stats .todo-clear a:hover { #todo-stats .todo-clear a:hover, #todo-stats .todo-clear a:focus {
color: #336699; color: #336699;
} }
...@@ -383,7 +384,7 @@ body { ...@@ -383,7 +384,7 @@ body {
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats .todo-clear a:hover { #todoapp #todo-stats .todo-clear a:hover, #todoapp #todo-stats .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -417,7 +417,7 @@ body { ...@@ -417,7 +417,7 @@ body {
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0; box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
} }
/* line 136 */ /* line 136 */
#todoapp #todo-stats .todo-clear a:hover { #todoapp #todo-stats .todo-clear a:hover, #todoapp #todo-stats .todo-clear a:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -137,7 +137,9 @@ body { ...@@ -137,7 +137,9 @@ body {
cursor: pointer; cursor: pointer;
} }
#tasks .clear:hover { /* focus is actually pointless here as it's not
possible to tab to the anchor for some reason */
#tasks .clear:hover, #tasks .clear:focus {
background: rgba(0, 0, 0, 0.15); background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
......
...@@ -341,17 +341,52 @@ body { ...@@ -341,17 +341,52 @@ body {
#todo-stats .todo-clear { #todo-stats .todo-clear {
float: right; float: right;
} }
#todo-stats .todo-clear a { #todo-stats a.todo-clear {
color: #777777; color: #777777;
font-size: 12px; font-size: 12px;
} }
#todo-stats .todo-clear a:visited { #todo-stats a.todo-clear {
color: #777777; color: #777777;
} }
#todo-stats .todo-clear a:hover { #todo-stats a.todo-clear:hover, #todo-stats a.todo-clear:focus {
color: #336699; color: #336699;
} }
/* line 125 */
#todo-stats a.todo-clear {
display: block;
line-height: 20px;
text-decoration: none;
-moz-border-radius: 12px;
-webkit-border-radius: 12px;
-o-border-radius: 12px;
-ms-border-radius: 12px;
-khtml-border-radius: 12px;
border-radius: 12px;
background: rgba(0, 0, 0, 0.1);
color: #555555;
font-size: 11px;
margin-top: 8px;
padding: 0 10px 1px;
-moz-box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
-o-box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 0 0;
}
/* line 136 */
#todo-stats a.todo-clear:hover, #todo-stats a.todo-clear:focus {
background: rgba(0, 0, 0, 0.15);
-moz-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
-o-box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
box-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0 0;
}
/* line 139 */
#todoapp #todo-stats a.todo-clear:active {
position: relative;
top: 1px;
}
#instructions { #instructions {
......
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