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/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/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 1bee024607..b369ceabe0 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,6 +67,11 @@ div.question-header { h1 { margin-top: 0; + font-weight: 100; + + a { + font-weight: 100; + } } div.meta-bar { @@ -89,10 +95,8 @@ div.question-header { width: flex-grid(4,8); a { - &.question-delete { - text-decoration: none; - cursor: pointer; - } + @extend a:link; + cursor: pointer; } span.sep { @@ -333,7 +337,6 @@ div.question-header { } div.controls { - border-top: 1px solid #efefef; text-align: right; a { diff --git a/lms/static/sass/course/discussion/_questions.scss b/lms/static/sass/course/discussion/_questions.scss index a699dc6c5e..9b7335e62b 100644 --- a/lms/static/sass/course/discussion/_questions.scss +++ b/lms/static/sass/course/discussion/_questions.scss @@ -10,6 +10,7 @@ div.question-list-header { h1 { margin: 0; font-size: 1em; + font-weight: 100; > a.light-button { float: right; diff --git a/lms/static/sass/course/discussion/_sidebar.scss b/lms/static/sass/course/discussion/_sidebar.scss index 947f8eb722..cac219b8cf 100644 --- a/lms/static/sass/course/discussion/_sidebar.scss +++ b/lms/static/sass/course/discussion/_sidebar.scss @@ -216,19 +216,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 +256,6 @@ div.discussion-wrapper aside { overflow: visible; ul { - font-size: 14px; - h2 { margin:0 (-(lh())) 5px (-(lh())); padding: lh(.5) lh(); diff --git a/lms/static/sass/course/discussion/_tags.scss b/lms/static/sass/course/discussion/_tags.scss index fd05ed0df0..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;