Merged branches

This commit is contained in:
Kyle Fiedler
2012-03-07 15:26:20 -05:00
3 changed files with 39 additions and 13 deletions

View File

@@ -42,9 +42,6 @@ div.answer-block {
padding-top: 20px;
width: 100%;
&.official {
}
div.official-stamp {
background: $mit-red;
color: #fff;
@@ -54,14 +51,6 @@ div.answer-block {
text-align: center;
margin-left: -1px;
}
span.official-comment {
@extend div.official-stamp;
display: block;
margin: 0 0 10px -5%;
padding-left: 5%;
text-align: left;
width:120px;
}
img.answer-img-accept {
margin: 10px 0px 10px 16px;

View File

@@ -129,3 +129,31 @@ form.question-form {
margin-top: 10px;
}
}
div#question-list {
background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box);
margin-top: -15px;
max-width: 505px;
min-width: 300px;
overflow: hidden;
padding-left: 5px;
position: absolute;
width: 35%;
z-index: 9999;
h2 {
text-transform: none;
padding: 8px 0;
border-bottom: 1px solid #eee;
margin: 0;
span {
background: #eee;
color: #555;
padding: 2px 5px;
@include border-radius(2px);
margin-right: 5px;
}
}
}

View File

@@ -183,12 +183,21 @@ div.question-header {
}
&.official {
// border-left: 4px solid $mit-red;
padding-top: 10px;
span.official-comment {
background: $mit-red;
color: #fff;
display: block;
font-size: 12px;
margin: 0 0 10px -5%;
padding:2px 5px 2px 5%;
text-align: left;
width:100px;
}
}
}
form.post-comments {
padding: 15px;