diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index 17e1df160f..88965db304 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -1,16 +1,36 @@ div.answer-controls { @include box-sizing(border-box); - @extend div.question-controls; display: inline-block; - margin: 20px 0; + margin: 0 0 15px; padding-left: flex-grid(1.1); - - div.answer-sort { - @extend div.question-sort; - } + width: 100%; div.answer-count { - @extend div.question-count; + display: inline-block; + float: left; + } + + div.answer-sort { + 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 { } div.answered-by-owner { - color: $mit-red; + p { + font-style: italic; + color: #656565; + } div.comments-container { color: #555; @@ -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 { border-top: 1px solid #eee; overflow:hidden; @@ -60,18 +111,28 @@ div.answer-own { } div.answer-actions { - text-align: right; + border-left: 3px solid darken(#F6EFD4, 10%); margin: 0; - padding: 0; + padding:8px 8px 8px 0; + text-align: right; + background:lighten(#F6EFD4, 5%); span.sep { color: #ddd; } + a { - text-decoration: none; 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; - } + } diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index f12229bb17..0e6b761181 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -792,53 +792,53 @@ body.anon #searchbar { margin-bottom: 16px; float: right; } -.paginator { - padding: 5px 0 10px 0; - font-size: 13px; - margin-bottom: 10px; - .prev a, .next a { - background-color: #fff; - color: #777; - padding: 2px 4px 3px 4px; - &:visited { - background-color: #fff; - color: #777; - padding: 2px 4px 3px 4px; } } - a { - color: #7ea9b3; } - .prev { - margin-right: .5em; } - .next { - margin-left: .5em; } - .page a { - padding: .25em; - background-color: #fff; - margin: 0em .25em; - color: #ff; - &:visited { - padding: .25em; - background-color: #fff; - margin: 0em .25em; - color: #ff; } } - .curr { - padding: .25em; - background-color: #fff; - margin: 0em .25em; - color: #ff; - background-color: #8ebcc7; - color: #fff; - font-weight: bold; } - .next a, .prev a { - color: #7ea9b3; } - .page a:hover, .curr a:hover, .prev a:hover, .next a:hover { - color: #8c8c8c; - background-color: #e1e1e1; - text-decoration: none; } - .text { - color: #777; - padding: .3em; } - .paginator-container-left { - padding: 5px 0 10px 0; } } +// .paginator { +// padding: 5px 0 10px 0; +// font-size: 13px; +// margin-bottom: 10px; +// .prev a, .next a { +// background-color: #fff; +// color: #777; +// padding: 2px 4px 3px 4px; +// &:visited { +// background-color: #fff; +// color: #777; +// padding: 2px 4px 3px 4px; } } +// a { +// color: #7ea9b3; } +// .prev { +// margin-right: .5em; } +// .next { +// margin-left: .5em; } +// .page a { +// padding: .25em; +// background-color: #fff; +// margin: 0em .25em; +// color: #ff; +// &:visited { +// padding: .25em; +// background-color: #fff; +// margin: 0em .25em; +// color: #ff; } } +// .curr { +// padding: .25em; +// background-color: #fff; +// margin: 0em .25em; +// color: #ff; +// background-color: #8ebcc7; +// color: #fff; +// font-weight: bold; } +// .next a, .prev a { +// color: #7ea9b3; } +// .page a:hover, .curr a:hover, .prev a:hover, .next a:hover { +// color: #8c8c8c; +// background-color: #e1e1e1; +// text-decoration: none; } +// .text { +// color: #777; +// padding: .3em; } +// .paginator-container-left { +// padding: 5px 0 10px 0; } } // .tag-size-1 { // font-size: 12px; } diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 090551b052..bdc2b3f980 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -103,8 +103,9 @@ div.question-header { div.post-update-info { @include box-sizing(border-box); - @include border-radius(5px); - background:lighten(#F6EFD4, 5%); + // @include border-radius(5px); + // background:lighten(#F6EFD4, 5%); + border-left: 3px solid darken(#F6EFD4, 10%); padding: 10px; margin-bottom: 10px; @@ -127,29 +128,33 @@ div.question-header { div.change-date { font-size: 12px; - margin-bottom: 10px; + margin-bottom: 2px; } - div.avatar { - display: inline-block; - float: left; - margin-right: 3px; + // 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; - } - } + // img.gravatar { + // background: white; + // border: 1px solid darken(#F6EFD4, 10%); + // margin-right: 5px; + // padding: 3px ; + // vertical-align: bottom; + // } + // } div.user-meta { display: inline-block; - width: 60%; + + span.username { + font-size: 20px; + margin-right: 5px; + } span.user-badges { - display: block; + // display: block; } } } diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index ce04f534dc..341fe7ee91 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -107,9 +107,9 @@ div.discussion-wrapper aside { input#clear { @include box-shadow(none); - @include border-radius(5px); + @include border-radius(15px); border: none; - background: $mit-red; + background: #bbb; color: #fff; display: inline; font-size: 10px; @@ -162,6 +162,3 @@ div.discussion-wrapper aside { } } } - - -