diff --git a/lms/askbot/skins/common/templates/question/answer_controls.html b/lms/askbot/skins/common/templates/question/answer_controls.html
index 52c4836e1e..f1896e0d95 100644
--- a/lms/askbot/skins/common/templates/question/answer_controls.html
+++ b/lms/askbot/skins/common/templates/question/answer_controls.html
@@ -31,7 +31,7 @@
{% spaceless %}
- {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}✖{% endif %}
+ {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}delete{% endif %}
{% endspaceless %}
{% endif %}
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/images/askbot/comment-vote-up.png b/lms/static/images/askbot/comment-vote-up.png
deleted file mode 100644
index 05dc84e12e..0000000000
Binary files a/lms/static/images/askbot/comment-vote-up.png and /dev/null differ
diff --git a/lms/static/images/askbot/vote-arrow-down-activate.png b/lms/static/images/askbot/old/vote-arrow-down-activate.png
similarity index 100%
rename from lms/static/images/askbot/vote-arrow-down-activate.png
rename to lms/static/images/askbot/old/vote-arrow-down-activate.png
diff --git a/lms/static/images/askbot/old/vote-arrow-down.png b/lms/static/images/askbot/old/vote-arrow-down.png
new file mode 100644
index 0000000000..e67524077a
Binary files /dev/null and b/lms/static/images/askbot/old/vote-arrow-down.png differ
diff --git a/lms/static/images/askbot/vote-arrow-up-activate.png b/lms/static/images/askbot/old/vote-arrow-up-activate.png
similarity index 100%
rename from lms/static/images/askbot/vote-arrow-up-activate.png
rename to lms/static/images/askbot/old/vote-arrow-up-activate.png
diff --git a/lms/static/images/askbot/old/vote-arrow-up.png b/lms/static/images/askbot/old/vote-arrow-up.png
new file mode 100644
index 0000000000..a35946cc51
Binary files /dev/null and b/lms/static/images/askbot/old/vote-arrow-up.png differ
diff --git a/lms/static/images/askbot/vote-arrow-down.png b/lms/static/images/askbot/vote-arrow-down.png
index e67524077a..501c2abfae 100644
Binary files a/lms/static/images/askbot/vote-arrow-down.png and b/lms/static/images/askbot/vote-arrow-down.png differ
diff --git a/lms/static/images/askbot/vote-arrow-up.png b/lms/static/images/askbot/vote-arrow-up.png
index a35946cc51..22de384120 100644
Binary files a/lms/static/images/askbot/vote-arrow-up.png and b/lms/static/images/askbot/vote-arrow-up.png differ
diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss
index 8e88f8befd..8bbfa67b1c 100644
--- a/lms/static/sass/course/_textbook.scss
+++ b/lms/static/sass/course/_textbook.scss
@@ -10,7 +10,6 @@ div.book-wrapper {
font-size: em(14);
.chapter-number {
-
}
.chapter {
@@ -81,9 +80,8 @@ div.book-wrapper {
section.book {
@extend .content;
- padding-bottom: 0;
padding-right: 0;
- padding-top: 0;
+ padding-left: lh();
nav {
@extend .clearfix;
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/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 04eaf73094..a438b93150 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -12,10 +12,13 @@ h1.top-header {
@include box-shadow(inset 0 1px 0 #fff);
color: #666;
cursor: pointer;
- font: normal $body-font-size $body-font-family;
+ font: 400 $body-font-size $body-font-family;
@include linear-gradient(#fff, lighten(#888, 40%));
padding: 4px 8px;
text-decoration: none;
+ text-shadow: none;
+ text-transform: none;
+ letter-spacing: 0;
-webkit-font-smoothing: antialiased;
&:hover, &:focus {
@@ -28,7 +31,7 @@ h1.top-header {
.content {
@include box-sizing(border-box);
display: table-cell;
- padding: lh();
+ padding-right: lh();
vertical-align: top;
width: flex-grid(9) + flex-gutter();
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 198902c146..24bea4dd84 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -12,7 +12,8 @@ div.course-wrapper {
section.course-content {
@extend .content;
- @include border-radius(0 4px 4px 0);
+ padding-right: 0;
+ padding-left: lh();
h1 {
margin: 0 0 lh();
diff --git a/lms/static/sass/course/discussion/_answers.scss b/lms/static/sass/course/discussion/_answers.scss
index 8ab22aa833..73660dd336 100644
--- a/lms/static/sass/course/discussion/_answers.scss
+++ b/lms/static/sass/course/discussion/_answers.scss
@@ -7,9 +7,16 @@ div.answer-controls {
padding-left: flex-grid(1.1);
width: 100%;
+
div.answer-count {
display: inline-block;
float: left;
+
+ h1 {
+ margin-bottom: 0;
+ font-size: em(24);
+ font-weight: 100;
+ }
}
div.answer-sort {
@@ -18,7 +25,7 @@ div.answer-controls {
nav {
float: right;
- margin-top: 34px;
+ margin-top: 10px;
a {
&.on span{
@@ -44,8 +51,9 @@ div.answer-block {
width: 100%;
img.answer-img-accept {
- margin: 10px 0px 10px 16px;
+ margin: 10px 0px 10px 11px;
}
+
div.answer-container {
@extend div.question-container;
@@ -130,21 +138,19 @@ div.answer-own {
div.answer-actions {
margin: 0;
- padding:8px 8px 8px 0;
+ padding:8px 0 8px 8px;
text-align: right;
border-top: 1px solid #efefef;
span.sep {
- color: #EDDFAA;
+ color: $border-color;
}
a {
cursor: pointer;
text-decoration: none;
-
- &.question-delete {
- color: $mit-red;
- }
+ @extend a:link;
+ font-size: em(14);
}
}
diff --git a/lms/static/sass/course/discussion/_badges.scss b/lms/static/sass/course/discussion/_badges.scss
index d74dd93d13..65d8cbf513 100644
--- a/lms/static/sass/course/discussion/_badges.scss
+++ b/lms/static/sass/course/discussion/_badges.scss
@@ -22,6 +22,8 @@ div#award-list{
}
ul.badge-list {
+ padding-left: 0;
+
li.badge {
border-bottom: 1px solid #eee;
@extend .clearfix;
@@ -70,12 +72,17 @@ ul.badge-list {
.bronze, .badge3 {
color: #cc9933;
}
-div.badge-desc {
- > div {
- margin-bottom: 20px;
- span {
- font-size: 18px;
- @include border-radius(10px);
- }
+
+div.discussion-wrapper aside {
+ div.badge-desc {
+ border-top: 0;
+
+ > div {
+ margin-bottom: 20px;
+ span {
+ font-size: 18px;
+ @include border-radius(10px);
+ }
+ }
}
}
diff --git a/lms/static/sass/course/discussion/_discussion.scss b/lms/static/sass/course/discussion/_discussion.scss
index 7b0aa601d9..e12f308ae2 100644
--- a/lms/static/sass/course/discussion/_discussion.scss
+++ b/lms/static/sass/course/discussion/_discussion.scss
@@ -8,7 +8,7 @@ body.askbot {
@include box-sizing(border-box);
display: table-cell;
min-width: 650px;
- padding: lh();
+ padding-right: lh();
vertical-align: top;
width: flex-grid(9) + flex-gutter();
diff --git a/lms/static/sass/course/discussion/_forms.scss b/lms/static/sass/course/discussion/_forms.scss
index ae02ab3b20..43ba07df19 100644
--- a/lms/static/sass/course/discussion/_forms.scss
+++ b/lms/static/sass/course/discussion/_forms.scss
@@ -5,6 +5,11 @@ form.answer-form {
border-top: 1px solid #ddd;
overflow: hidden;
padding-left: flex-grid(1.1);
+ padding-top: lh();
+
+ p {
+ margin-bottom: lh();
+ }
textarea {
@include box-sizing(border-box);
@@ -121,7 +126,6 @@ form.question-form {
border: none;
padding: 15px 0 0 0;
-
input[type="text"] {
@include box-sizing(border-box);
width: flex-grid(6);
@@ -131,6 +135,11 @@ form.question-form {
margin-top: 10px;
}
+ input[value="Cancel"] {
+ @extend .light-button;
+ float: right;
+ }
+
div#question-list {
background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box);
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/_profile.scss b/lms/static/sass/course/discussion/_profile.scss
index 010a03ffd6..f20b51b72b 100644
--- a/lms/static/sass/course/discussion/_profile.scss
+++ b/lms/static/sass/course/discussion/_profile.scss
@@ -9,9 +9,9 @@ body.user-profile-page {
}
ul.sub-info {
- // border-top: 1px solid #ddd;
margin-top: lh();
list-style: none;
+ padding: 0;
> li {
display: table-cell;
@@ -57,6 +57,7 @@ body.user-profile-page {
ul {
list-style: none;
+ padding: 0;
&.user-stats-table {
list-style: none;
@@ -72,37 +73,28 @@ body.user-profile-page {
margin-bottom: 30px;
li {
- background-position: 10px center;
+ background-position: 10px -10px;
background-repeat: no-repeat;
- @include border-radius(4px);
display: inline-block;
- height: 20px;
- padding: 10px 10px 10px 40px;
+ padding: 2px 10px 2px 40px;
+ margin-bottom: lh(.5);
+ border: 1px solid lighten($border-color, 10%);
&.up {
- background-color:#d1e3a8;
- background-image: url(../images/askbot/vote-arrow-up-activate.png);
+ background-image: url(../images/askbot/vote-arrow-up.png);
margin-right: 6px;
-
- span.vote-count {
- color: #3f6c3e;
- }
}
&.down {
- background-image: url(../images/askbot/vote-arrow-down-activate.png);
- background-color:#eac6ad;
-
- span.vote-count {
- color: $mit-red;
- }
-
+ background-image: url(../images/askbot/vote-arrow-down.png);
}
}
}
&.badges {
@include inline-block();
+ padding: 0;
+ margin: 0;
a {
background-color: #e3e3e3;
diff --git a/lms/static/sass/course/discussion/_question-view.scss b/lms/static/sass/course/discussion/_question-view.scss
index 4c2acaf9be..f7657dbf97 100644
--- a/lms/static/sass/course/discussion/_question-view.scss
+++ b/lms/static/sass/course/discussion/_question-view.scss
@@ -1,15 +1,16 @@
// Styles for the single question view
div.question-header {
+ @include clearfix();
div.official-stamp {
background: $mit-red;
color: #fff;
font-size: 12px;
+ margin-left: -1px;
margin-top: 10px;
padding: 2px 5px;
text-align: center;
- margin-left: -1px;
}
div.vote-buttons {
@@ -19,40 +20,40 @@ div.question-header {
width: flex-grid(0.7,9);
ul {
- li {
- background-position: center;
- background-repeat: no-repeat;
- cursor: pointer;
- font-weight: bold;
- height: 20px;
- list-style: none;
- padding: 10px;
- text-align: center;
- width: 70%;
+ padding: 0;
+ margin: 0;
- &.post-vote {
- @include border-radius(4px);
- @include box-shadow(inset 0 1px 0px #fff);
- }
+ li {
+ background-repeat: no-repeat;
+ color: #999;
+ font-size: em(20);
+ font-weight: bold;
+ list-style: none;
+ text-align: center;
&.question-img-upvote, &.answer-img-upvote {
background-image: url(../images/askbot/vote-arrow-up.png);
- @include box-shadow(inset 0 1px 0px rgba(255, 255, 255, 0.5));
+ background-position: center 0;
+ cursor: pointer;
+ height: 12px;
+ margin-bottom: lh(.5);
&:hover, &.on {
- background-color:#d1e3a8;
- border-color: darken(#D1E3A8, 20%);
- background-image: url(../images/askbot/vote-arrow-up-activate.png);
+ background-image: url(../images/askbot/vote-arrow-up.png);
+ background-position: center -22px;
}
}
&.question-img-downvote, &.answer-img-downvote {
+ cursor: pointer;
background-image: url(../images/askbot/vote-arrow-down.png);
+ background-position: center 0;
+ height: 12px;
+ margin-top: lh(.5);
&:hover, &.on {
- background-color:#EAC6AD;
- border-color: darken(#EAC6AD, 20%);
- background-image: url(../images/askbot/vote-arrow-down-activate.png);
+ background-image: url(../images/askbot/vote-arrow-down.png);
+ background-position: center -22px;
}
}
}
@@ -66,12 +67,19 @@ div.question-header {
h1 {
margin-top: 0;
+ font-weight: 100;
+ line-height: 1.1em;
+
+ a {
+ font-weight: 100;
+ line-height: 1.1em;
+ }
}
div.meta-bar {
border-bottom: 1px solid #eee;
display: block;
- margin: 10px 0;
+ margin: lh(.5) 0 lh();
overflow: hidden;
padding: 5px 0 10px;
@@ -89,11 +97,8 @@ div.question-header {
width: flex-grid(4,8);
a {
- &.question-delete {
- color: $mit-red;
- text-decoration: none;
- cursor: pointer;
- }
+ @extend a:link;
+ cursor: pointer;
}
span.sep {
@@ -155,7 +160,7 @@ div.question-header {
}
div.change-date {
- font-size: 12px;
+ font-size: em(14);
margin-bottom: 2px;
}
@@ -179,13 +184,13 @@ div.question-header {
display: inline-block;
padding: 0 0 3% 0;
width: 100%;
+ margin-top: lh(2);
div.comments-content {
- font-size: 13px;
- background: #efefef;
+ border-top: 1px solid lighten($border-color, 10%);
.block {
- border-top: 1px solid #ddd;
+ border-top: 1px solid lighten($border-color, 10%);
padding: 15px;
display: block;
@@ -197,10 +202,10 @@ div.question-header {
padding-top: 10px;
span.official-comment {
- background: $mit-red;
+ background: $pink;
color: #fff;
display: block;
- font-size: 12px;
+ font-size: em(12);
margin: 0 0 10px -5%;
padding:2px 5px 2px 5%;
text-align: left;
@@ -212,6 +217,10 @@ div.question-header {
form.post-comments {
padding: 15px;
+ button {
+ color: #fff;
+ }
+
button:last-child {
margin-left: 10px;
@extend .light-button;
@@ -232,7 +241,6 @@ div.question-header {
border: none;
@include box-shadow(none);
display: inline-block;
- margin-top: -8px;
padding:0 2% 0 0;
text-align: center;
width: 5%;
@@ -278,16 +286,14 @@ div.question-header {
}
div.comment-delete {
- // display: inline;
- color: $mit-red;
+ @extend a:link;
cursor: pointer;
- font-size: 15px;
}
div.comment-edit {
@include transform(rotate(50deg));
cursor: pointer;
- font-size: 16px;
+
a.edit-icon {
color: #555;
text-decoration: none;
@@ -305,13 +311,13 @@ div.question-header {
div.comment-meta {
text-align: right;
+ margin-top: lh(.5);
a.author {
font-weight: bold;
}
a.edit {
- font-size: 12px;
padding: 2px 10px;
}
}
@@ -334,12 +340,10 @@ div.question-header {
}
div.controls {
- border-top: 1px solid #efefef;
text-align: right;
a {
display: inline-block;
- font-size: 12px;
margin: 10px 10px 10px 0;
}
}
diff --git a/lms/static/sass/course/discussion/_questions.scss b/lms/static/sass/course/discussion/_questions.scss
index 4f855cd092..1b77231bba 100644
--- a/lms/static/sass/course/discussion/_questions.scss
+++ b/lms/static/sass/course/discussion/_questions.scss
@@ -1,17 +1,24 @@
// Styles for the default question list view
div.question-list-header {
+ @extend h1.top-header;
display: block;
margin-bottom: 0px;
+ padding-bottom: lh(.5);
overflow: hidden;
width: flex-grid(9,9);
- @extend h1.top-header;
h1 {
margin: 0;
+ font-size: 1em;
+ font-weight: 100;
+ padding-bottom: lh(.5);
> a.light-button {
float: right;
+ font-size: em(14, 24);
+ letter-spacing: 0;
+ font-weight: 400;
}
}
@@ -49,8 +56,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;
}
@@ -82,6 +92,7 @@ div.question-list-header {
a {
color: #555;
+ font-size: em(14, 24);
}
}
@@ -90,12 +101,10 @@ div.question-list-header {
}
ul.tags {
- li {
- background: #fff;
-
- &:before {
- border-color: transparent #fff transparent transparent;
- }
+ span, div {
+ line-height: 1em;
+ margin-left: 6px;
+ cursor: pointer;
}
}
}
@@ -103,26 +112,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 +131,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 +154,41 @@ 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;
+ line-height: lh();
}
}
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 +200,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..7ee435f8af 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,30 @@ 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;
+ padding: 6px 10px 6px 5px;
+
+ a {
+ padding: 0;
+ line-height: 12px;
+
+ &:hover {
+ background: transparent;
+ }
+ }
}
}
@@ -85,9 +95,6 @@ div.discussion-wrapper aside {
}
}
- img.gravatar {
- @include border-radius(3px);
- }
}
&.tag-selector {
@@ -100,17 +107,19 @@ 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;
+ padding: 6px 0 0;
position: absolute;
text-indent: -9999px;
width: 24px;
@@ -131,30 +140,26 @@ div.discussion-wrapper aside {
}
input#clear {
- @include box-shadow(none);
- @include border-radius(15px);
+ background: none;
border: none;
- background: #bbb;
- color: #fff;
+ @include border-radius(0);
+ @include box-shadow(none);
+ color: #999;
display: inline;
- font-size: 10px;
- margin-left: -25px;
+ font-size: 12px;
+ font-weight: bold;
+ height: 19px;
+ line-height: 1em;
+ margin: {
+ left: -25px;
+ top: 8px;
+ }
padding: 2px 5px;
+ text-shadow: none;
}
}
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 +172,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 +198,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);
@@ -216,19 +230,20 @@ div.discussion-wrapper aside {
}
div.karma {
- background: #eee;
- border: 1px solid #D3D3D3;
- @include border-radius(3px);
+ border: 1px solid $border-color;
@include box-sizing(border-box);
- @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff);
padding: lh(.4) 0;
text-align: center;
width: flex-grid(1, 3);
float: right;
- strong {
- display: block;
- font-style: 20px;
+ p {
+ text-align: center;
+
+ strong {
+ display: block;
+ font-style: 20px;
+ }
}
}
@@ -255,8 +270,6 @@ div.discussion-wrapper aside {
overflow: visible;
ul {
- font-size: 14px;
-
h2 {
margin:0 (-(lh())) 5px (-(lh()));
padding: lh(.5) lh();
@@ -265,40 +278,29 @@ div.discussion-wrapper aside {
}
div.question-tips, div.markdown {
- ul {
- margin-left: 8%;
- }
-
+ ul,
ol {
- margin-left: 8%;
- }
- }
- div.markdown ul li {
- margin: 20px 0;
-
- &:first-child {
margin: 0;
- }
+ padding: 0;
- ol li {
- margin: 0;
+ li {
+ border-bottom: 0;
+ line-height: lh();
+ margin-bottom: em(8);
+ }
}
}
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..5cf78a4816 100644
--- a/lms/static/sass/course/discussion/_tags.scss
+++ b/lms/static/sass/course/discussion/_tags.scss
@@ -3,6 +3,7 @@
ul.tags {
list-style: none;
display: inline;
+ padding: 0;
li, a {
position: relative;
@@ -10,19 +11,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 +30,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 +41,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;
}
diff --git a/lms/static/sass/shared/_forms.scss b/lms/static/sass/shared/_forms.scss
index 842ffb0086..d6a5f482e3 100644
--- a/lms/static/sass/shared/_forms.scss
+++ b/lms/static/sass/shared/_forms.scss
@@ -42,6 +42,7 @@ textarea {
input[type="submit"],
input[type="button"],
+button,
.button {
@include border-radius(3px);
@include button(shiny, $blue);