merging in master

This commit is contained in:
Saman Bemel-Benrud
2013-05-15 23:36:06 -04:00
5 changed files with 85 additions and 24 deletions
+21 -8
View File
@@ -236,7 +236,7 @@ ul.toggle-list {
ul.toggle-list li a {
position: relative;
padding: 5px 10px 5px 25px;
padding: 5px 10px 5px 30px;
display:block;
border-top: 1px solid #ccc;
}
@@ -275,13 +275,13 @@ ul.link-list li:last-child {
content: "";
display: inline-block;
border-radius: 50%;
height: 12px;
width: 12px;
height: 16px;
width: 16px;
margin-right: 10px;
border: 1px solid #CCC;
position: absolute;
left: 5px;
top: 8px;
top: 5px;
}
.toggle-list a:hover::before {
@@ -293,6 +293,19 @@ ul.link-list li:last-child {
box-shadow: inset 0 0 0 2px white;
}
.toggle-list.check-list a::before {
border-radius: 2px;
}
.toggle-list.check-list a:hover::before {
background: white url(img/sprite.svg) no-repeat -480px -0px;
box-shadow: none;
}
.toggle-list.check-list a.selected::before {
background: white url(img/sprite.svg) no-repeat -480px -20px;
}
/* Utility Classes
------------------------------------------------------- */
.fillL {
@@ -1122,20 +1135,20 @@ input[type=number] {
border-bottom: 1px solid #CCC;
color: #7092FF;
width: 100%;
padding-left: 25px;
padding-left: 30px;
}
.radio-wrap button::before {
content: "";
display: inline-block;
border-radius: 50%;
height: 12px;
width: 12px;
height: 16px;
width: 16px;
margin-right: 10px;
border: 1px solid #CCC;
position: absolute;
left: 5px;
top: 8px;
top: 5px;
}
.radio-wrap button:hover::before {