Skip to content

E
edx-platform
Commit 78826ec0 by kaishin
Options

Question view enhancements

parent 77b6c862
Showing with 145 additions and 82 deletions
sass/discussion/_answers.scss
div.answer-controls { div.answer-controls {
@include box-sizing(border-box); @include box-sizing(border-box);
@extend div.question-controls;
display: inline-block; display: inline-block;
margin: 20px 0; margin: 0 0 15px;
padding-left: flex-grid(1.1); padding-left: flex-grid(1.1);
width: 100%;
div.answer-sort { div.answer-count {
@extend div.question-sort; display: inline-block;
float: left;
} }
div.answer-count { div.answer-sort {
@extend div.question-count; float: right;
margin-left: flex-gutter();
nav {
@extend .action-link;
float: right;
margin-top: 25px;
a {
&.on span{
font-weight: bold;
}
&:before {
content: '|';
color: darken(#F6EFD4, 10%);
font-size: 22px;
}
}
}
} }
} }
...@@ -44,7 +64,10 @@ div.answer-block { ...@@ -44,7 +64,10 @@ div.answer-block {
} }
div.answered-by-owner { div.answered-by-owner {
color: $mit-red; p {
font-style: italic;
color: #656565;
}
div.comments-container { div.comments-container {
color: #555; color: #555;
...@@ -52,6 +75,34 @@ div.answer-block { ...@@ -52,6 +75,34 @@ div.answer-block {
} }
} }
div.paginator {
@extend div.answer-block;
text-align: center;
padding: 20px 0;
span {
@include border-radius(3px);
background: #eee;
margin: 0 5px;
padding: 4px 10px;
&.curr {
background: none;
color: $mit-red;
font-weight: bold;
}
&.next, &.prev {
@extend .light-button;
}
a {
color: #555;
text-decoration: none;
}
}
}
div.answer-own { div.answer-own {
border-top: 1px solid #eee; border-top: 1px solid #eee;
overflow:hidden; overflow:hidden;
...@@ -60,18 +111,28 @@ div.answer-own { ...@@ -60,18 +111,28 @@ div.answer-own {
} }
div.answer-actions { div.answer-actions {
text-align: right; border-left: 3px solid darken(#F6EFD4, 10%);
margin: 0; margin: 0;
padding: 0; padding:8px 8px 8px 0;
text-align: right;
background:lighten(#F6EFD4, 5%);
span.sep { span.sep {
color: #ddd; color: #ddd;
} }
a { a {
text-decoration: none;
cursor: pointer; cursor: pointer;
text-decoration: none;
&.question-delete {
color: $mit-red;
}
&.question-edit, &.permant-link {
color: darken(#F6EFD4, 45%);;
}
} }
a.question-edit, a.permant-link {
color: #999;
}
} }
sass/discussion/_askbot-original.scss
...@@ -792,53 +792,53 @@ body.anon #searchbar { ...@@ -792,53 +792,53 @@ body.anon #searchbar {
margin-bottom: 16px; margin-bottom: 16px;
float: right; } float: right; }
.paginator { // .paginator {
padding: 5px 0 10px 0; // padding: 5px 0 10px 0;
font-size: 13px; // font-size: 13px;
margin-bottom: 10px; // margin-bottom: 10px;
.prev a, .next a { // .prev a, .next a {
background-color: #fff; // background-color: #fff;
color: #777; // color: #777;
padding: 2px 4px 3px 4px; // padding: 2px 4px 3px 4px;
&:visited { // &:visited {
background-color: #fff; // background-color: #fff;
color: #777; // color: #777;
padding: 2px 4px 3px 4px; } } // padding: 2px 4px 3px 4px; } }
a { // a {
color: #7ea9b3; } // color: #7ea9b3; }
.prev { // .prev {
margin-right: .5em; } // margin-right: .5em; }
.next { // .next {
margin-left: .5em; } // margin-left: .5em; }
.page a { // .page a {
padding: .25em; // padding: .25em;
background-color: #fff; // background-color: #fff;
margin: 0em .25em; // margin: 0em .25em;
color: #ff; // color: #ff;
&:visited { // &:visited {
padding: .25em; // padding: .25em;
background-color: #fff; // background-color: #fff;
margin: 0em .25em; // margin: 0em .25em;
color: #ff; } } // color: #ff; } }
.curr { // .curr {
padding: .25em; // padding: .25em;
background-color: #fff; // background-color: #fff;
margin: 0em .25em; // margin: 0em .25em;
color: #ff; // color: #ff;
background-color: #8ebcc7; // background-color: #8ebcc7;
color: #fff; // color: #fff;
font-weight: bold; } // font-weight: bold; }
.next a, .prev a { // .next a, .prev a {
color: #7ea9b3; } // color: #7ea9b3; }
.page a:hover, .curr a:hover, .prev a:hover, .next a:hover { // .page a:hover, .curr a:hover, .prev a:hover, .next a:hover {
color: #8c8c8c; // color: #8c8c8c;
background-color: #e1e1e1; // background-color: #e1e1e1;
text-decoration: none; } // text-decoration: none; }
.text { // .text {
color: #777; // color: #777;
padding: .3em; } // padding: .3em; }
.paginator-container-left { // .paginator-container-left {
padding: 5px 0 10px 0; } } // padding: 5px 0 10px 0; } }
// .tag-size-1 { // .tag-size-1 {
// font-size: 12px; } // font-size: 12px; }
......
sass/discussion/_question-view.scss
...@@ -103,8 +103,9 @@ div.question-header { ...@@ -103,8 +103,9 @@ div.question-header {
div.post-update-info { div.post-update-info {
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(5px); // @include border-radius(5px);
background:lighten(#F6EFD4, 5%); // background:lighten(#F6EFD4, 5%);
border-left: 3px solid darken(#F6EFD4, 10%);
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -127,29 +128,33 @@ div.question-header { ...@@ -127,29 +128,33 @@ div.question-header {
div.change-date { div.change-date {
font-size: 12px; font-size: 12px;
margin-bottom: 10px; margin-bottom: 2px;
} }
div.avatar { // div.avatar {
// display: inline-block;
// float: left;
// margin-right: 3px;
// img.gravatar {
// background: white;
// border: 1px solid darken(#F6EFD4, 10%);
// margin-right: 5px;
// padding: 3px ;
// vertical-align: bottom;
// }
// }
div.user-meta {
display: inline-block; display: inline-block;
float: left;
margin-right: 3px;
img.gravatar { span.username {
background: white; font-size: 20px;
border: 1px solid darken(#F6EFD4, 10%);
margin-right: 5px; margin-right: 5px;
padding: 3px ;
vertical-align: bottom;
} }
}
div.user-meta {
display: inline-block;
width: 60%;
span.user-badges { span.user-badges {
display: block; // display: block;
} }
} }
} }
......
sass/discussion/_sidebar.scss
...@@ -107,9 +107,9 @@ div.discussion-wrapper aside { ...@@ -107,9 +107,9 @@ div.discussion-wrapper aside {
input#clear { input#clear {
@include box-shadow(none); @include box-shadow(none);
@include border-radius(5px); @include border-radius(15px);
border: none; border: none;
background: $mit-red; background: #bbb;
color: #fff; color: #fff;
display: inline; display: inline;
font-size: 10px; font-size: 10px;
...@@ -162,6 +162,3 @@ div.discussion-wrapper aside { ...@@ -162,6 +162,3 @@ div.discussion-wrapper aside {
} }
} }
} }
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