From 1e11a6b02eb59d68f2d4d373f81a226101e220df Mon Sep 17 00:00:00 2001 From: Byron Date: Thu, 20 Oct 2011 01:36:51 -0600 Subject: Ask Question template --- .../js/wmd/images/editor-toolbar-background.png | Bin 0 -> 282 bytes askbot/skins/common/media/js/wmd/wmd.css | 10 +- .../default/media/images/close-small-dark.png | Bin 226 -> 879 bytes askbot/skins/default/media/images/close-tag.png | Bin 879 -> 0 bytes .../skins/default/media/images/medium-button.png | Bin 0 -> 217 bytes askbot/skins/default/media/images/tips.png | Bin 0 -> 716 bytes askbot/skins/default/media/style/lib_style.less | 1 + askbot/skins/default/media/style/style.css | 336 +++++++++++++-------- askbot/skins/default/templates/ask.html | 4 + .../templates/widgets/question_edit_tips.html | 6 +- 10 files changed, 225 insertions(+), 132 deletions(-) create mode 100644 askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png mode change 100755 => 100644 askbot/skins/default/media/images/close-small-dark.png delete mode 100644 askbot/skins/default/media/images/close-tag.png create mode 100644 askbot/skins/default/media/images/medium-button.png create mode 100644 askbot/skins/default/media/images/tips.png diff --git a/askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png b/askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png new file mode 100644 index 00000000..41875962 Binary files /dev/null and b/askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png differ diff --git a/askbot/skins/common/media/js/wmd/wmd.css b/askbot/skins/common/media/js/wmd/wmd.css index f1091a35..1ba80626 100644 --- a/askbot/skins/common/media/js/wmd/wmd.css +++ b/askbot/skins/common/media/js/wmd/wmd.css @@ -9,7 +9,13 @@ #wmd-button-bar { - background-color: White; + background: url(images/editor-toolbar-background.png) repeat-x bottom; + height:36px; + border-left:#cce6ec 3px solid; + border-top:#cce6ec 3px solid; + border-right:#cce6ec 3px solid; + float:left; + width:670px; } #wmd-input @@ -35,7 +41,7 @@ position: relative; margin-left: 5px; margin-right: 5px; - margin-bottom: 5px; + margin-bottom: 0px; margin-top: 10px; padding: 0px; height: 20px; diff --git a/askbot/skins/default/media/images/close-small-dark.png b/askbot/skins/default/media/images/close-small-dark.png old mode 100755 new mode 100644 index 280c1fc7..72ada35b Binary files a/askbot/skins/default/media/images/close-small-dark.png and b/askbot/skins/default/media/images/close-small-dark.png differ diff --git a/askbot/skins/default/media/images/close-tag.png b/askbot/skins/default/media/images/close-tag.png deleted file mode 100644 index 72ada35b..00000000 Binary files a/askbot/skins/default/media/images/close-tag.png and /dev/null differ diff --git a/askbot/skins/default/media/images/medium-button.png b/askbot/skins/default/media/images/medium-button.png new file mode 100644 index 00000000..f384be91 Binary files /dev/null and b/askbot/skins/default/media/images/medium-button.png differ diff --git a/askbot/skins/default/media/images/tips.png b/askbot/skins/default/media/images/tips.png new file mode 100644 index 00000000..7e8aafdf Binary files /dev/null and b/askbot/skins/default/media/images/tips.png differ diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less index 471f8333..34710137 100644 --- a/askbot/skins/default/media/style/lib_style.less +++ b/askbot/skins/default/media/style/lib_style.less @@ -8,6 +8,7 @@ @button-label:#4a757f; @section-title:#7ea9b3; @info-text:#8d8d8d; +@info-text-dark:#6b6b6b; /* Variables for fonts*/ diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index d81100c9..ca1a5ee6 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -489,7 +489,7 @@ h1 { } ul { - margin-left: 15px; + margin-left: 22px; } li { @@ -542,6 +542,29 @@ img.gravatar { margin:1px; } +/* tips and markdown help are widgets for ask template */ + +#tips{ + li{ + color:@info-text; + font-size:16px; + list-style-image: url(../images/tips.png); + } + a{ + font-size:16px; + } +} + +#markdownHelp{ + li{ + color:@info-text; + font-size:16px; + } + a{ + font-size:16px; + } +} + /* ----- Sorting top Tab, check main_page/tab_bar.html ------*/ .tabBar { @@ -669,6 +692,14 @@ ul#searchTags { /* ----- Question list , check main_page/content.html and macros/macros.html----- */ +#question-list { + float: left; + position: relative; + background-color: #FFF; + padding: 0; + width: 100%; +} + .short-summary { position: relative; filter: inherit; @@ -1030,63 +1061,21 @@ ul#related-tags li { margin-right: 5px; } -#askFormBar { - display:inline-block; - background-color: #e3e3e3;/*888a85; /*#e9b96e;*/ - border: 1px solid #aaaaaa; - padding: 4px 7px 5px 5px; -} -#askFormBar p { - width: 685px; - margin:0 0 5px 0; -} -#askFormBar .questionTitleInput { - font-size: 24px; - line-height: 24px; - height: 36px; - width: 680px; - margin: 0px; - padding: 5px 0 0 5px; -} - -#question-list { - float: left; - position: relative; - background-color: #FFF; - padding: 0; - width: 100%; -} - -.ask-page div#question-list { - float: none; - width: 706px; -} -.ask-page div#question-list h2 { - font-size: 14px; - padding-bottom: 0; -} -.ask-page div#question-list span { - padding: 3px 7px; - margin-right: 5px; - background: #ccc; -} - span.delete-icon { padding-left: 13px; vertical-align: bottom; - background: url(../images/close-tag.png) bottom no-repeat; + background: url(../images/close-small-dark.png) bottom no-repeat; cursor: default; } span.delete-icon:hover { - background: url(../images/close-tag.png) top no-repeat; - + background: url(../images/close-small-dark.png) top no-repeat; } .tags span.delete-icon { float: left; height: 20px; width:8px; - margin-left:10px; + margin: 0px 0 0 10px; border-left:#fff 1px solid; display: block; } @@ -1104,6 +1093,180 @@ span.delete-icon:hover { padding-right: 15px; } +/* ----- Ask Question Form template----- */ + +#askFormBar { + display:inline-block; + padding: 4px 7px 5px 0px; + margin-top:10px; + + p{ + width: 670px; + margin:0 0 5px 0; + font-size:16px; + color:@info-text-dark; + line-height:1.2; + } + .questionTitleInput { + font-size: 24px; + line-height: 24px; + height: 36px; + width: 670px; + margin: 0px; + padding: 0px 0 0 5px; + border:#cce6ec 3px solid; + } +} + +.ask-page{ + + div#question-list { + float: none; + width: 677px; + border-bottom:#f0f0ec 1px solid; + float:left; + margin-bottom:10px; + + } + + div#question-list h2 { + font-size: 16px; + padding-bottom: 0; + color:@link; + border-top:#f0f0ec 1px solid; + border-left:#f0f0ec 1px solid; + height:30px; + line-height:30px; + font-weight:normal; + } + + div#question-list span { + width:28px; + height:26px; + line-height:26px; + text-align:center; + margin-right: 10px; + float:left; + display:block; + color:#fff; + background: #b8d0d5; + .rounded-corners(3px); + } + label{ + color:@info-text-dark; + font-size:15px; + } + + #id_tags{ + border:#cce6ec 3px solid; + width:665px; + height:25px; + padding-left:5px; + } +} + +.title-desc { + color: @info-text; + font-size: 15px; +} + +.ask-page input.submit, +.edit-question-page input.submit { + float: left; + background: url(../images/medium-button.png) top repeat-x; + height:34px; + border:0; + font-family:@yanone; + color:@button-label; + font-weight:normal; + font-size:21px; + margin-top:3px; + .rounded-corners(4px); + .box-shadow(1px, 1px, 2px, #636363); +} +.ask-page input.submit:hover, +.edit-question-page input.submit:hover{ + text-decoration:none; + background: url(../images/medium-button.png) bottom repeat-x; + .text-shadow(0px, 1px, 0px, #c6d9dd) +} +#editor { /*adjustment for editor preview*/ + font-size: 100%; + min-height: 200px; + line-height: 18px; + width: 650px; + margin:0; + border-left:#cce6ec 3px solid; + border-bottom:#cce6ec 3px solid; + border-right:#cce6ec 3px solid; + border-top:0; + padding:10px; + margin-bottom:10px; +} + +#id_title { + width: 100%; +} + +.wmd-preview { + margin: 3px 0 5px 0; + padding: 6px; + width: 665px; + background-color: #F5F5F5; + min-height: 20px; + overflow: auto; +} + +.wmd-preview pre { + background-color: #E7F1F8; + +} + +.wmd-preview blockquote { + background-color: #eee; +} + +.wmd-preview IMG { + max-width: 600px; +} + +.preview-toggle { + width: 100%; + color: #b6a475; /*letter-spacing:1px;*/ + text-align: left; +} + +.preview-toggle span:hover { + cursor: pointer; +} + +.after-editor { + margin-top: 10px; +} + +.checkbox { + margin-left:5px; + font-weight:normal; + cursor:help +} + +.question-options { + margin-top: 1px; + float: left; + color: #666; + line-height: 13px; +} +.question-options label { + vertical-align: text-bottom; +} + + +.edit-content-html { + border-top: 1px dotted #D8D2A9; + border-bottom: 1px dotted #D8D2A9; + margin: 5px 0 5px 0; +} + /* ----- Footer links , check blocks/footer.html----- */ @@ -1716,87 +1879,6 @@ span.form-error { margin-left: 5px; } -.title-desc { - color: #666666; - font-size: 90%; -} - -/*adjustment for editor preview*/ -#editor { - font-size: 100%; - min-height: 200px; - line-height: 18px; - width: 702px; - margin:0; -} - -#id_title { - width: 100%; -} - -.wmd-preview { - margin: 3px 0 5px 0; - padding: 6px; - width: 691px; - background-color: #F5F5F5; - min-height: 20px; - overflow: auto; -} - -.wmd-preview pre { - background-color: #E7F1F8; - -} - -.wmd-preview blockquote { - background-color: #eee; -} - -.wmd-preview IMG { - max-width: 600px; -} - -.preview-toggle { - width: 100%; - color: #666; /*letter-spacing:1px;*/ - text-align: left; -} - -.preview-toggle span:hover { - cursor: pointer; -} - -.after-editor { - margin-top: 10px; -} - -.checkbox { - margin-left:5px; - font-weight:normal; - cursor:help -} - -.question-options { - margin-top: 1px; - float: left; - color: #666; - line-height: 13px; -} -.question-options label { - vertical-align: text-bottom; -} - -.ask-page input.submit, -.edit-question-page input.submit { - float: left; -} - -.edit-content-html { - border-top: 1px dotted #D8D2A9; - border-bottom: 1px dotted #D8D2A9; - margin: 5px 0 5px 0; -} - .revision { margin: 10px 0 10px 0; width: 100%; diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html index 07bd8424..f398af04 100644 --- a/askbot/skins/default/templates/ask.html +++ b/askbot/skins/default/templates/ask.html @@ -9,6 +9,9 @@ {% block sidebar %} {% include "widgets/question_edit_tips.html" %} {% endblock %} +{% block content %} + Here needs to be placed the form! +{% endblock %} {% block endjs %} @@ -60,4 +63,5 @@ }); {% endblock %} + diff --git a/askbot/skins/default/templates/widgets/question_edit_tips.html b/askbot/skins/default/templates/widgets/question_edit_tips.html index 83c36840..b62c6338 100644 --- a/askbot/skins/default/templates/widgets/question_edit_tips.html +++ b/askbot/skins/default/templates/widgets/question_edit_tips.html @@ -1,5 +1,5 @@ -
+

{% trans %}question tips{% endtrans %}

  • {% trans %}please ask a relevant question{% endtrans %} @@ -12,11 +12,11 @@

- {% trans %}faq{% endtrans %} » + {% trans %}FAQ{% endtrans %} »

-
+

{% trans %}Markdown tips{% endtrans %}

    {% if settings.MARKDUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %} -- cgit v1.2.3-1-g7c22