From 3e88abe36d8e60ba07f25d098de66d5326d031b0 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 9 Jan 2015 21:44:41 +0100 Subject: [PATCH] updated answerbox design --- app/assets/stylesheets/scss/answerbox.scss | 12 ++++++++---- app/views/shared/_answerbox.html.haml | 20 +++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss index ff85cb91..50a90b39 100644 --- a/app/assets/stylesheets/scss/answerbox.scss +++ b/app/assets/stylesheets/scss/answerbox.scss @@ -1,5 +1,5 @@ -.text-muted a, .answerbox .text-muted a:hover { - color: $gray-dark; +.answerbox .text-muted a, .answerbox .text-muted a:hover { + color: $gray; text-decoration: none; } @@ -23,6 +23,10 @@ } .answerbox--question-text { - font-weight: bold; - color: $gray-darker; + color: $gray; +} + +.answerbox--answer-text { + font-weight: 16px; + color: $gray-base; } \ No newline at end of file diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index fc24adae..e1ec29b8 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -20,18 +20,20 @@ ยท %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} #{a.question.answer_count} answers - %p.answerbox--question-text - = a.question.content + .answerbox--question-text + = markdown a.question.content .panel-body - if @display_all.nil? - = markdown a.content[0..255] - - if a.content.length > 255 - [...] - %p - %a.btn.btn-primary{href: show_user_answer_path(a.user.screen_name, a.id)} - Read the entire answer + .answerbox--answer-text + = markdown a.content[0..255] + - if a.content.length > 255 + [...] + %p + %a.btn.btn-primary{href: show_user_answer_path(a.user.screen_name, a.id)} + Read the entire answer - else - = markdown a.content + .answerbox--answer-text + = markdown a.content - if @user.nil? .row .col-md-6.col-sm-4.col-xs-7.text-left.text-muted