Skip to content

E
edx-platform
Commit bbe94325 by Kyle Fiedler
Options

Lots of askbot fixes

parent 44635421
Showing with 89 additions and 132 deletions
lms/askbot/skins/common/templates/question/question_controls.html
...@@ -40,6 +40,5 @@ ...@@ -40,6 +40,5 @@
{% endif %} {% endif %}
{% if request.user|can_delete_post(question) %}{{ pipe() }} {% if request.user|can_delete_post(question) %}{{ pipe() }}
<a class="question-delete" id="question-delete-link-{{question.id}}">{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}&#10006;{% endif %}</a> <a class="question-delete" id="question-delete-link-{{question.id}}">{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}delete{% endif %}</a>
{% endif %} {% endif %}
lms/askbot/skins/mitx/templates/base.html
...@@ -18,11 +18,14 @@ ...@@ -18,11 +18,14 @@
{% include "widgets/system_messages.html" %} {% include "widgets/system_messages.html" %}
{% include "debug_header.html" %} {% include "debug_header.html" %}
{% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #} {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}
{# include "widgets/secondary_header.html" #} {# Scope selector, search input and ask button #}
<section class="container"> <section class="content-wrapper">
{# include "widgets/secondary_header.html" #} {# Scope selector, search input and ask button #}
<section class="container">
{% block body %} {% block body %}
{% endblock %} {% endblock %}
</section>
</section> </section>
{% if settings.FOOTER_MODE == 'default' %} {% if settings.FOOTER_MODE == 'default' %}
......
lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html
{% load extra_filters_jinja %} {% load extra_filters_jinja %}
<!--<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />-->
{{ 'application' | compressed_css }} {{ 'application' | compressed_css }}
{{ 'course' | compressed_css }} {{ 'course' | compressed_css }}
lms/static/sass/course/base/_base.scss
...@@ -2,7 +2,7 @@ body { ...@@ -2,7 +2,7 @@ body {
min-width: 980px; min-width: 980px;
} }
body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a { body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label {
text-align: left; text-align: left;
font-family: $sans-serif; font-family: $sans-serif;
} }
...@@ -27,6 +27,10 @@ form { ...@@ -27,6 +27,10 @@ form {
} }
} }
img {
max-width: 100%;
}
::selection, ::-moz-selection, ::-webkit-selection { ::selection, ::-moz-selection, ::-webkit-selection {
background:#444; background:#444;
color:#fff; color:#fff;
......
lms/static/sass/course/discussion/_answers.scss
...@@ -141,10 +141,6 @@ div.answer-actions { ...@@ -141,10 +141,6 @@ div.answer-actions {
a { a {
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
&.question-delete {
color: $mit-red;
}
} }
} }
lms/static/sass/course/discussion/_modals.scss
// Style for modal boxes that pop up to notify the user of various events // Style for modal boxes that pop up to notify the user of various events
.vote-notification { .vote-notification {
background-color: darken($mit-red, 7%); background-color: darken($mit-red, 7%);
@include border-radius(4px); @include border-radius(4px);
......
lms/static/sass/course/discussion/_question-view.scss
...@@ -90,7 +90,6 @@ div.question-header { ...@@ -90,7 +90,6 @@ div.question-header {
a { a {
&.question-delete { &.question-delete {
color: $mit-red;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
......
lms/static/sass/course/discussion/_questions.scss
...@@ -9,6 +9,7 @@ div.question-list-header { ...@@ -9,6 +9,7 @@ div.question-list-header {
h1 { h1 {
margin: 0; margin: 0;
font-size: 1em;
> a.light-button { > a.light-button {
float: right; float: right;
...@@ -49,8 +50,11 @@ div.question-list-header { ...@@ -49,8 +50,11 @@ div.question-list-header {
nav { nav {
@extend .action-link; @extend .action-link;
float: right; float: right;
font-size: em(16, 24);
a { a {
font-size: 1em;
&.on span{ &.on span{
font-weight: bold; font-weight: bold;
} }
...@@ -103,26 +107,15 @@ div.question-list-header { ...@@ -103,26 +107,15 @@ div.question-list-header {
ul.question-list, div#question-list { ul.question-list, div#question-list {
width: flex-grid(9,9); width: flex-grid(9,9);
padding-left: 0;
margin: 0;
li.single-question { li.single-question {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
list-style: none; list-style: none;
padding: 10px lh(); padding: lh() 0;
margin-left: (-(lh()));
width: 100%; width: 100%;
&:hover {
background: #F3F3F3;
ul.tags li {
background: #ddd;
&:before {
border-color: transparent #ddd transparent transparent;
}
}
}
&:first-child { &:first-child {
border-top: 0; border-top: 0;
} }
...@@ -133,14 +126,19 @@ ul.question-list, div#question-list { ...@@ -133,14 +126,19 @@ ul.question-list, div#question-list {
&.question-body { &.question-body {
@include box-sizing(border-box); @include box-sizing(border-box);
margin-right: flex-gutter(); margin-right: flex-gutter();
width: flex-grid(5.5,9); width: flex-grid(5,9);
h2 { h2 {
font-size: 16px; font-size: em(20);
font-weight: bold; font-weight: bold;
letter-spacing: 0; letter-spacing: 0;
margin: 0px 0 15px 0; margin: 0 0 lh() 0;
text-transform: none; text-transform: none;
line-height: lh();
a {
line-height: lh();
}
} }
p.excerpt { p.excerpt {
...@@ -151,40 +149,40 @@ ul.question-list, div#question-list { ...@@ -151,40 +149,40 @@ ul.question-list, div#question-list {
div.user-info { div.user-info {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin-bottom: 10px; margin: lh() 0 0 0;
line-height: lh();
span.relative-time { span.relative-time {
font-weight: normal; font-weight: normal;
} }
a {
color: $mit-red;
}
} }
ul.tags { ul.tags {
display: inline-block; display: inline-block;
margin: lh() 0 0 0;
padding: 0;
} }
} }
&.question-meta { &.question-meta {
float: right; float: right;
margin-top: 10px; width: flex-grid(3,9);
width: flex-grid(3.5,9);
ul { ul {
text-align: right; @include clearfix;
margin: 0;
padding: 0;
list-style: none;
li { li {
border: 1px solid #ddd; border: 1px solid lighten($border-color, 10%);
@include box-sizing(border-box);
@include box-shadow(0 1px 0 #fff); @include box-shadow(0 1px 0 #fff);
display: inline-block;
height:60px; height:60px;
@include linear-gradient(#fff, #f5f5f5); float: left;
margin-right: 10px; margin-right: flex-gutter(3);
width: 60px; width: flex-grid(1,3);
&:last-child { &:last-child {
margin-right: 0px; margin-right: 0px;
...@@ -196,31 +194,22 @@ ul.question-list, div#question-list { ...@@ -196,31 +194,22 @@ ul.question-list, div#question-list {
} }
} }
&.views {
}
&.answers { &.answers {
&.accepted { &.accepted {
border-color: lighten($border-color, 10%);
@include linear-gradient(#fff, lighten( #c4dfbe, 12% ));
border-color: #c4dfbe;
span, div { span, div {
color: darken(#c4dfbe, 35%); color: darken(#c4dfbe, 35%);
} }
} }
&.no-answers {
&.no-answers {
span, div { span, div {
color: lighten($mit-red, 20%); color: $pink;
} }
} }
} }
&.votes {
}
span, div { span, div {
@include box-sizing(border-box); @include box-sizing(border-box);
color: #888; color: #888;
......
lms/static/sass/course/discussion/_sidebar.scss
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
div.discussion-wrapper aside { div.discussion-wrapper aside {
@extend .sidebar; @extend .sidebar;
border-left: 1px solid #d3d3d3; border-left: 1px solid $border-color;
@include border-radius(0 4px 4px 0); border-right: 0;
border-right: 1px solid #f6f6f6;
@include box-shadow(inset 1px 0 0 #f6f6f6);
padding: lh();
width: flex-grid(3); width: flex-grid(3);
&.main-sidebar { &.main-sidebar {
...@@ -15,12 +12,16 @@ div.discussion-wrapper aside { ...@@ -15,12 +12,16 @@ div.discussion-wrapper aside {
h1 { h1 {
@extend .bottom-border; @extend .bottom-border;
margin: (-(lh())) (-(lh())) 0;
padding: lh(.5) lh(); padding: lh(.5) lh();
margin-bottom: em(16, 20);
} }
h2 { h2 {
color: #4D4D4D; color: #3C3C3C;
font-size: 1em;
font-style: normal;
font-weight: bold;
margin-bottom: 1em;
&.first { &.first {
margin-top: 0px; margin-top: 0px;
...@@ -36,6 +37,9 @@ div.discussion-wrapper aside { ...@@ -36,6 +37,9 @@ div.discussion-wrapper aside {
input[type="submit"] { input[type="submit"] {
width: 27%; width: 27%;
float: right; float: right;
text-align: center;
padding-left: 0;
padding-right: 0;
} }
input[type="text"] { input[type="text"] {
...@@ -45,24 +49,24 @@ div.discussion-wrapper aside { ...@@ -45,24 +49,24 @@ div.discussion-wrapper aside {
div.box { div.box {
display: block; display: block;
margin: lh(.5) 0; padding: lh(.5) lh();
border-top: 1px solid lighten($border-color, 10%);
&:last-child { &:first-child {
@include box-shadow(none); border-top: 0;
border: 0;
} }
h2 { ul#related-tags {
text-transform: uppercase; position: relative;
font-weight: bold; left: -10px;
font-size: 14px;
letter-spacing: 1px;
&:not(.first) { li {
@include box-shadow(inset 0 1px 0 #eee); border-bottom: 0;
border-top: 1px solid #d3d3d3; background: #eee;
margin: 0 (-(lh())) 0;
padding: lh(.5) lh(); a:hover {
background: transparent;
}
} }
} }
...@@ -85,9 +89,6 @@ div.discussion-wrapper aside { ...@@ -85,9 +89,6 @@ div.discussion-wrapper aside {
} }
} }
img.gravatar {
@include border-radius(3px);
}
} }
&.tag-selector { &.tag-selector {
...@@ -100,17 +101,18 @@ div.discussion-wrapper aside { ...@@ -100,17 +101,18 @@ div.discussion-wrapper aside {
div.search-box { div.search-box {
margin-top: lh(.5); margin-top: lh(.5);
input { input {
@include box-sizing(border-box); @include box-sizing(border-box);
display: inline; display: inline;
} }
input[type='submit'] { input[type='submit'] {
@include box-shadow(none);
opacity: 0.5;
background: url(../images/askbot/search-icon.png) no-repeat center; background: url(../images/askbot/search-icon.png) no-repeat center;
border: 0; border: 0;
@include box-shadow(none);
margin-left: 3px; margin-left: 3px;
opacity: 0.5;
position: absolute; position: absolute;
text-indent: -9999px; text-indent: -9999px;
width: 24px; width: 24px;
...@@ -144,17 +146,6 @@ div.discussion-wrapper aside { ...@@ -144,17 +146,6 @@ div.discussion-wrapper aside {
} }
div#tagSelector { div#tagSelector {
h2 {
@include box-shadow(inset 0 1px 0 #eee);
border-top: 1px solid #d3d3d3;
margin: 0 (-(lh())) 0;
padding: lh(.5) lh();
text-transform: uppercase;
font-weight: bold;
font-size: 14px;
letter-spacing: 1px;
}
ul { ul {
margin: 0; margin: 0;
} }
...@@ -167,11 +158,17 @@ div.discussion-wrapper aside { ...@@ -167,11 +158,17 @@ div.discussion-wrapper aside {
p.choice { p.choice {
@include inline-block(); @include inline-block();
margin-right: lh(.5); margin-right: lh(.5);
margin-top: 0;
} }
} }
label {
font-style: normal;
font-weight: 400;
}
} }
// Question view sopecific // Question view specific
div.follow-buttons { div.follow-buttons {
margin-top: 20px; margin-top: 20px;
...@@ -187,12 +184,15 @@ div.discussion-wrapper aside { ...@@ -187,12 +184,15 @@ div.discussion-wrapper aside {
div.question-stats { div.question-stats {
border-top: 0;
ul { ul {
color: #777; color: #777;
list-style: none; list-style: none;
li { li {
padding: 7px 0 0; padding: 7px 0 0;
border: 0;
&:last-child { &:last-child {
@include box-shadow(none); @include box-shadow(none);
...@@ -273,6 +273,7 @@ div.discussion-wrapper aside { ...@@ -273,6 +273,7 @@ div.discussion-wrapper aside {
margin-left: 8%; margin-left: 8%;
} }
} }
div.markdown ul li { div.markdown ul li {
margin: 20px 0; margin: 20px 0;
...@@ -286,19 +287,15 @@ div.discussion-wrapper aside { ...@@ -286,19 +287,15 @@ div.discussion-wrapper aside {
} }
div.view-profile { div.view-profile {
h2 { border-top: 0;
border-top: 0;
@include box-shadow(none);
}
a { a {
width: 100%; @extend .light-button;
@include box-sizing(border-box); @include box-sizing(border-box);
text-align: center;
padding: 10px;
display: block; display: block;
margin-top: 10px; text-align: center;
@extend .light-button; width: 100%;
margin-top: lh(.5);
&:first-child { &:first-child {
margin-top: 0; margin-top: 0;
......
lms/static/sass/course/discussion/_tags.scss
...@@ -10,19 +10,17 @@ ul.tags { ...@@ -10,19 +10,17 @@ ul.tags {
li { li {
background: #eee; background: #eee;
@include border-radius(4px);
@include box-shadow(0px 1px 0px #ccc);
color: #555; color: #555;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 15px; margin-left: 15px;
padding: 3px 10px 5px 5px; padding: 6px 10px 6px 5px;
&:before { &:before {
border-color:transparent #eee transparent transparent; border-color:transparent #eee transparent transparent;
border-style:solid; border-style:solid;
border-width:12px 12px 12px 0; border-width:12px 10px 12px 0;
content:""; content:"";
height:0; height:0;
left:-10px; left:-10px;
...@@ -31,25 +29,6 @@ ul.tags { ...@@ -31,25 +29,6 @@ ul.tags {
width:0; width:0;
} }
span.delete-icon, div.delete-icon {
background: #555;
@include border-radius(0 4px 4px 0);
clear: none;
color: #eee;
cursor: pointer;
display: inline;
float: none;
left: 10px;
opacity: 0.5;
padding: 4px 6px;
position: relative;
top: 1px;
&:hover {
opacity: 1;
}
}
a { a {
color: #555; color: #555;
text-decoration: none; text-decoration: none;
...@@ -61,11 +40,4 @@ ul.tags { ...@@ -61,11 +40,4 @@ ul.tags {
span.tag-number { span.tag-number {
display: none; display: none;
// @include border-radius(3px);
// background: #555;
// font-size: 10px;
// margin: 0 3px;
// padding: 2px 5px;
// color: #eee;
// opacity: 0.5;
} }
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