diff options
-rw-r--r-- | askbot/skins/common/templates/question/answer_controls.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/media/images/link.png | bin | 0 -> 601 bytes | |||
-rw-r--r-- | askbot/skins/default/media/style/style.css | 248 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/answer_card.html | 5 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/answer_tab_bar.html | 1 | ||||
-rw-r--r-- | askbot/skins/default/templates/question/question_card.html | 1 |
6 files changed, 137 insertions, 120 deletions
diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html index 87c39066..4d26ffb9 100644 --- a/askbot/skins/common/templates/question/answer_controls.html +++ b/askbot/skins/common/templates/question/answer_controls.html @@ -1,6 +1,6 @@ {% set pipe=joiner('<span class="sep">|</span>') %} <span class="linksopt">{{ pipe() }} - <a + <a class="permant-link" href="{{ answer.get_absolute_url() }}" title="{% trans %}answer permanent link{% endtrans %}"> {% trans %}permanent link{% endtrans %} diff --git a/askbot/skins/default/media/images/link.png b/askbot/skins/default/media/images/link.png Binary files differnew file mode 100644 index 00000000..6ad60f5e --- /dev/null +++ b/askbot/skins/default/media/images/link.png diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 745f4a22..0b5bc70f 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -438,6 +438,7 @@ h1 { width: 730px; float: left; position: relative; + padding-bottom:10px; } #ContentRight { @@ -1248,6 +1249,7 @@ span.delete-icon:hover { font-size: 15px; } +#fmanswer input.submit, .ask-page input.submit, .edit-question-page input.submit { float: left; @@ -1262,6 +1264,8 @@ span.delete-icon:hover { .rounded-corners(4px); .box-shadow(1px, 1px, 2px, #636363); } + +#fmanswer input.submit:hover, .ask-page input.submit:hover, .edit-question-page input.submit:hover{ text-decoration:none; @@ -1292,6 +1296,13 @@ span.delete-icon:hover { background-color: #F5F5F5; min-height: 20px; overflow: auto; + font-size:13px; + font-family:@trebuchet; + + p{ + font-size:13px; + margin-bottom:14px; + } } .wmd-preview pre { @@ -1371,10 +1382,11 @@ span.delete-icon:hover { font-family:@yanone; vertical-align: top; } - + .question-content{ float:right; width:690px; + margin-bottom:10px; } #question-table{ @@ -1384,19 +1396,19 @@ span.delete-icon:hover { #question-table, .answer-table { - margin: 6px 0 10px 0; + margin: 6px 0 0px 0; border-spacing: 0px; width: 100%; } .answer-table { - border-bottom: 1px solid #bbb; + border-bottom: 1px solid #D4D4D4; clear: both; } .answer-table td, #question-table td { - width:30px; + width:20px; vertical-align:top; } .question-body, .answer-body { @@ -1410,6 +1422,14 @@ span.delete-icon:hover { line-height:1.4; font-size:13px; } + + a { + color:@link; + } + + li { + margin-bottom:0.7em; + } } .question-body IMG, .answer-body IMG { @@ -1474,7 +1494,7 @@ span.delete-icon:hover { text-decoration: none; height:18px; display:block; - float:left; + float:right; line-height:18px; margin-top:-2px; margin-left:4px; @@ -1486,12 +1506,12 @@ span.delete-icon:hover { } .sep { color: #ccc; - float:left; + float:right; height:18px; font-size:18px; } } - .post-controls,.answer-controls{ + .post-controls, .answer-controls{ .question-delete{ background: url(../images/delete.png) no-repeat center left; padding-left:16px; @@ -1508,6 +1528,9 @@ span.delete-icon:hover { .question-close{ background: url(../images/close.png) no-repeat center left; } + .permant-link{ + background: url(../images/link.png) no-repeat center left; + } } .tabBar{ width:100%; @@ -1725,54 +1748,117 @@ span.delete-icon:hover { line-height: 50%; } } + #questionTools { + font-size: 22px; + margin-top: 11px; + text-align: left; + } -} + .question-status { + margin-top: 10px; + margin-bottom:15px + padding: 20px; + background-color: #F5F5F5; + text-align: center; + } -#questionTools { - font-size: 22px; - margin-top: 11px; - text-align: left; -} + .question-status h3 { + font-size: 125%; + } + .vote-buttons { + float: left; + text-align: center; + padding-top: 2px; + } -.question-status { - margin-top: 10px; - margin-bottom:15px - padding: 20px; - background-color: #F5F5F5; - text-align: center; -} + .vote-buttons IMG { + cursor: pointer; + } -.question-status h3 { - font-size: 125%; -} + .vote-number { + font-family: @yanone; + padding: 0px 0 5px 0; + font-size: 25px; + font-weight: bold; + color: #777; + } -.vote-buttons { - float: left; - text-align: center; - padding-top: 2px; -} + .vote-buttons .notify-sidebar { + text-align: left; + } + .vote-buttons .notify-sidebar label { + vertical-align: top; + } + .accepted-answer { + background-color: #f7fecc; + border-bottom-color: #9BD59B; + + .vote-buttons { + width:27px; + } + } -.vote-buttons IMG { - cursor: pointer; -} + .answer .post-update-info a{ + color:#444444; + } + + .accepted-answer .comments { + background-color: #f1f6d4; + } -.vote-number { - font-family: Arial; - padding: 0px 0 3px 0; - font-size: 140%; - font-weight: bold; - color: #777; -} + .answered { + background: #CCC; + color: #999; + } + + .answered-accepted { + background: #DCDCDC; + color: #763333; + + strong { + color: #E1E818; + } + } + + .answered-by-owner { + background: #F1F1FF; + + .comments .button { + background-color: #E6ECFF; + } + .comments { + background-color: #E6ECFF; + } + } + + .answer-img-accept:hover { + background: url(../images/vote-accepted-on.png) + } + .answer-body a { + color:@link; + } + .answer-body li { + margin-bottom:0.7em; + } + + #fmanswer{ + color:@info-text; + font-size:16px; + line-height:1.2; + margin-top:10px; + } + .message { + padding: 5px; + margin: 10px 0 10px 0; + + } -.vote-buttons .notify-sidebar { - text-align: left; -} -.vote-buttons .notify-sidebar label { - vertical-align: top; } + + /* ----- Footer links , check blocks/footer.html----- */ #ground { @@ -1853,19 +1939,6 @@ a:hover.medal { } -.linksopt a { - color: #777; - padding: 3px; - cursor: pointer; -} - -.linksopt a:hover { - background-color: #777; - text-decoration: none; - color: #fff; -} - - span.text-counter { margin-right: 20px; } @@ -1881,48 +1954,7 @@ p.form-item { } -.accepted-answer { - background-color: #EBFFE6; - border-bottom-color: #9BD59B; -} - -.accepted-answer .comments .button { - background-color: #CCFFBF; -} - -.accepted-answer .comments { - background-color: #CCFFBF; -} - -.answered { - background: #CCC; - color: #999; -} - -.answered-accepted { - background: #CCC; - color: #763333; -} - -.answered-by-owner { - background: #E9E9FF; -} - -.answered-by-owner .comments .button { - background-color: #E6ECFF; -} - -.answered-by-owner .comments { - background-color: #E6ECFF; -} - -.answered-accepted strong { - color: #E1E818; -} -.answer-img-accept:hover { - background: url(../images/vote-accepted-on.png) -} .deleted { background: #F4E7E7 none repeat scroll 0 0; @@ -2348,13 +2380,6 @@ a.offensive { display: inline; } -.message { - padding: 5px; - margin: 10px 0 10px 0; - background-color: #eee; - border: 1px solid #aaaaaa; -} - .message h1 { padding-top: 0px; font-size: 15px; @@ -2640,20 +2665,9 @@ p.signup_p { } /* a workaround to set link colors correctly */ -.answer-body a { - color:#0000ff; -} -.question-body a { - color:#0000ff; -} -.question-body li { - margin-bottom:0.7em; -} -.answer-body li { - margin-bottom:0.7em; -} + .wmd-preview a { - color:#0000ff; + color:@link; } .wmd-preview li { margin-bottom:0.7em; diff --git a/askbot/skins/default/templates/question/answer_card.html b/askbot/skins/default/templates/question/answer_card.html index f2786e54..f623294f 100644 --- a/askbot/skins/default/templates/question/answer_card.html +++ b/askbot/skins/default/templates/question/answer_card.html @@ -17,10 +17,13 @@ </div> {{ answer.html }} </div> + <div class="answer-controls post-controls"> + {% include "question/answer_controls.html" %} </div> - + <!-- Needs a validation if comments exists --> + <h1 id="comment-title">Comments</h1> {% include "question/answer_comments.html" %} </div> </td> diff --git a/askbot/skins/default/templates/question/answer_tab_bar.html b/askbot/skins/default/templates/question/answer_tab_bar.html index ebb4dec5..04584bbd 100644 --- a/askbot/skins/default/templates/question/answer_tab_bar.html +++ b/askbot/skins/default/templates/question/answer_tab_bar.html @@ -7,7 +7,6 @@ {% endtrans %} </h1> <div class="tabsA"> - <span class="label"> Sort by ยป </span> diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html index b5cde475..215f6766 100644 --- a/askbot/skins/default/templates/question/question_card.html +++ b/askbot/skins/default/templates/question/question_card.html @@ -16,6 +16,7 @@ <div id="question-controls" class="post-controls"> {% include "question/question_controls.html" %} </div> + <!-- Needs a validation if comments exists --> <h1 id="comment-title">Comments</h1> {% include "question/question_comments.html" %} </div> |