Merge branch 'master' into feature/cdodge/cms-master-merge4

This commit is contained in:
Chris Dodge
2013-01-17 20:30:22 -05:00
24 changed files with 475 additions and 402 deletions

View File

@@ -194,30 +194,9 @@
margin-bottom: 40px;
h3 {
background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
font-family: $sans-serif;
font-weight: 700;
margin-bottom: 10px;
padding-left: 20px;
cursor: pointer;
}
.answer {
display: none;
color: #3c3c3c;
padding-left: 16px;
font-family: $serif;
li {
line-height: 1.6em;
}
}
// opened states
&.opened {
h3 {
background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
}
margin-bottom: 15px;
}
}
}

View File

@@ -426,6 +426,14 @@
font-size: 1.2rem;
font-weight: bold;
}
strong {
font-weight: 700;
a {
font-weight: 700;
}
}
}
.actions {

View File

@@ -1,36 +1,78 @@
.static-container.help {
section.questions {
float: left;
width: flex-grid(9);
margin-right: flex-gutter();
@include clearfix;
article {
margin-bottom: 40px;
nav.categories {
border: 1px solid rgb(220,220,220);
@include box-sizing(border-box);
float: left;
margin-left: flex-gutter();
padding: 20px;
width: flex-grid(3);
h2 {
border-bottom: 1px solid rgb(220,220,220);
margin-bottom: 40px;
padding-bottom: 20px;
a {
display: block;
letter-spacing: 1px;
margin: 0px -20px;
padding: 12px 0px 12px 20px;
text-align: left;
&:hover {
background: rgb(245,245,245);
text-decoration: none;
}
}
}
}
section.emails {
border: 1px solid rgb(220,220,220);
@include box-sizing(border-box);
float: left;
padding: 20px;
width: flex-grid(3);
.responses {
float: left;
width: flex-grid(9);
ul {
margin-left: 0;
padding-left: 0;
list-style: none;
.category {
padding-top: 40px;
li {
margin-bottom: 1em;
&:first-child {
padding-top: 0px;
}
> h2 {
border-bottom: 1px solid rgb(220,220,220);
margin-bottom: 40px;
padding-bottom: 20px;
}
}
.response {
margin-bottom: 40px;
h3 {
background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
font-family: $sans-serif;
font-weight: 700;
margin-bottom: 10px;
padding-left: 20px;
cursor: pointer;
}
.answer {
display: none;
color: #3c3c3c;
padding-left: 16px;
font-family: $serif;
li {
line-height: 1.6em;
}
}
// opened states
&.opened {
h3 {
background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
}
}
}
}
}
}

View File

@@ -232,8 +232,9 @@ $red: rgb(178, 6, 16);
}
input, textarea {
height: 100%;
width: 100%;
padding: $baseline ($baseline*.75);
padding: ($baseline/2);
&.long {
width: 100%;