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