diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-01-09 02:45:50 -0500 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-01-09 02:45:50 -0500 |
commit | e5e4298abe7c3601cd9ac19e87469452d53799e5 (patch) | |
tree | 344bb41eea3ded991b455e55ee05a620117a0dac | |
parent | 4f3cf1a5f5a8cac887a413e37ae3e797a710b145 (diff) | |
download | askbot-e5e4298abe7c3601cd9ac19e87469452d53799e5.tar.gz askbot-e5e4298abe7c3601cd9ac19e87469452d53799e5.tar.bz2 askbot-e5e4298abe7c3601cd9ac19e87469452d53799e5.zip |
removed more unused css
13 files changed, 50 insertions, 324 deletions
diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js index a28a519e..12299a82 100644 --- a/askbot/skins/default/media/js/post.js +++ b/askbot/skins/default/media/js/post.js @@ -1486,7 +1486,7 @@ var socialSharing = function(){ return { init: function(page_url, text_to_share){ URL = window.location.href; - TEXT = escape($('div.headNormal > a').html()); + TEXT = escape($('h1 > a').html()); var fb = $('a.fb-share') var tw = $('a.twitter-share'); copyAltToTitle(fb); diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index a6cba91f..13655e45 100755 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -477,20 +477,6 @@ blockquote { font: normal 12px sans-serif; } -.paginator .prev-na, -.paginator .next-na { - padding: .3em; - font: bold .875em sans-serif; -} - -.paginator .prev-na, -.paginator .next-na { - border: 1px solid #ccc; - background-color: #f9f9f9; - color: #aaa; - font-weight: normal; -} - .paginator .prev a, .paginator .prev a:visited, .paginator .next a, .paginator .next a:visited { border: 1px solid #fff; @@ -500,11 +486,11 @@ blockquote { font: bold 100% sans-serif; } -.paginator .prev, .paginator .prev-na { +.paginator .prev { margin-right: .5em; } -.paginator .next, .paginator .next-na { +.paginator .next { margin-left: .5em; } @@ -540,32 +526,10 @@ blockquote { font: bold 100% sans-serif; } -.paginator-container { - float: right; - padding: 10px 0 10px 0; -} - .paginator-container-left { padding: 5px 0 10px 0; } -/*标签*/ -/* todo: probably needs to be removed -conflicts with WMD! -.tag { - font-size: 13px; - font-weight: normal; - color: #333; - text-decoration: none; - background-color: #EEE; - border-left: 3px solid #777; - border-top: 1px solid #EEE; - border-bottom: 1px solid #CCC; - border-right: 1px solid #CCC; - padding: 1px 8px 1px 8px; -} -*/ - .tags { font-family: sans-serif; line-height: 200%; @@ -593,28 +557,6 @@ conflicts with WMD! color: #333; } -.tagsbox { - line-height: 200%; -} - -.tagsbox a { - font-size: 13px; - font-weight: normal; - color: #333; - text-decoration: none; - background-color: #EEE; - border-left: 3px solid #777; - border-top: 1px solid #EEE; - border-bottom: 1px solid #CCC; - border-right: 1px solid #CCC; - padding: 1px 8px 1px 8px; -} - -.tagsbox a:hover { - background-color: #fFF; - color: #333; -} - .tag-number { font-weight: 700; font-family: sans-serif; @@ -629,7 +571,7 @@ conflicts with WMD! white-space: nowrap; } -/*奖牌*/ +/* badges */ a.medal { font-size: 14px; line-height: 250%; @@ -665,6 +607,10 @@ a:hover.medal { margin-top: 3px; } +.tabBar h2 { + float: left; +} + .tabsA, .tabsC { background-color: #FFF; float: right; @@ -731,142 +677,6 @@ a:hover.medal { text-decoration: none; } -.headlineA { - font-size: 13px; - border-bottom: 1px solid #777; - padding-bottom: 2px; - font-weight: 800; - margin-bottom: 12px; - text-align: right; - height: 30px; -} - -.headQuestions { - height: 23px; - line-height: 23px; - margin: 5px 0 0 5px; - padding: 0px 6px 0px 15px; - font-size: 15px; - font-weight: 700; - border-bottom: 0px solid #777; - border-left: 0px solid #darkred; - background-color: #FFF; - background: url(../images/dot-list.gif) no-repeat left center; -} - -.headAnswers { - float: left; - padding: 3px; - font-size: 18px; - font-weight: 800; - background: url(../images/ico_answers.gif) left 2px no-repeat; - padding-left: 24px; -} - -.headTags { - float: left; - padding: 3px; - font-size: 18px; - font-weight: 800; - background: url(../images/ico_tags.gif) no-repeat; - padding-left: 24px; -} - -/* todo: make this class applicable to all headers it is actually uses in tags.html too */ -.headUsers { - float: left; - height: 23px; - line-height: 23px; - margin: 5px 0 0 5px; - padding: 0px 6px 0px 15px; - font-size: 15px; - font-weight: 700; - border-bottom: 0px solid #777; - border-left: 0px solid #darkred; - background-color: #FFF; - background: url(../images/dot-list.gif) no-repeat left center; -} - -.headMedals { - float: left; - height: 23px; - line-height: 23px; - margin: 5px 0 0 5px; - padding: 0px 6px 0px 15px; - font-size: 15px; - font-weight: 700; - border-bottom: 0px solid #777; - border-left: 0px solid #darkred; - background-color: #FFF; - background: url(../images/dot-list.gif) no-repeat left center; -} - -.headLogin { - float: left; - padding: 3px; - font-size: 15px; - font-weight: 800; - background: url(../images/ico_login.gif) no-repeat; - padding-left: 24px; -} - -.headNormal { - text-align: left; - padding: 3px; - font-size: 15px; - margin-bottom: 12px; - font-weight: bold; - border-bottom: 1px solid #777; -} - -.headUser { - text-align: left; - padding: 5px; - font-size: 20px; /*letter-spacing:1px;*/ - margin-bottom: 12px; - font-weight: 800; - border-bottom: 1px solid #777; -} - -/*RSS订阅*/ -#feeds { - margin: 10px 0; -} - -#feeds a { - background: url(../images/feed-icon-small.png) no-repeat 0; - padding-left: 18px; - font-weight: 700; - font-size: 13px; -} - -/*问题*/ -#question { - margin-bottom: 30px; -} - -#question h1 { - font-size: 15px; - background: #CCC; - padding: 6px 8px;; -} - -#question .body { - background: #F7F7F7; - padding: 20px 10px; -} - -.starter { - padding: 10px; - background: #E0EAF1; -} - -.vote { - font-size: 20px; - color: #666; - font-weight: 800; -} - .questions-related { font-weight: 700; word-wrap: break-word; @@ -899,22 +709,6 @@ a:hover.medal { max-width: 600px; } -.question-mark { - /*background-color:#fff5e0; - border-top: 1px solid #eeeeec; - border-right: 1px solid #babdb6; - border-bottom: 1px solid #babdb6; - border-left: 1px solid #eeeeec;*/ - text-align: left; - padding: 5px; - overflow: hidden; -} - -.question-edit { - text-align: left; - overflow: hidden; -} - .vote-buttons { float: left; text-align: center; @@ -994,12 +788,6 @@ a:hover.medal { color: #ccc; } -.wiki-category { - margin-left: 5px; - color: #999; - font-size: 90%; -} - .comments { font-size: 11px; line-height: 15px; @@ -1092,15 +880,6 @@ div.comments { } /*回答*/ -#answers { -} - -.answer { - padding-top: 10px; - width: 100%; - border-bottom: 1px solid #ccccce; -} - .answer-body { min-height: 80px; font-size: 13px; @@ -1134,11 +913,6 @@ div.comments { color: #763333; } -.unanswered { - background: #777; - color: white; -} - .answered-by-owner { background: #E9E9FF; } @@ -1163,11 +937,7 @@ div.comments { background: #F4E7E7 none repeat scroll 0 0; } -/*标签列表*/ -/* -.tagsbox {} -.tagsbox a {color:#000;line-height:30px;margin-right:10px;font-size:100%;background-color:#F9F7ED;padding:3px;border:1px solid #aaaaaa;} -.tagsbox a:hover {text-decoration:none;background-color:#F9F7ED;color:#B02B2C;} */ +/* tags */ .tagsList { margin: 0; list-style-type: none; @@ -1180,17 +950,11 @@ div.comments { float: left; } -.badge-list { - margin: 0; - list-style-type: none; -} - -/*登录*/ -.list-item { +.boxC ul { margin-left: 15px; } -.list-item LI { +.boxC li { list-style-type: disc; font-size: 13px; line-height: 20px; @@ -1232,9 +996,6 @@ table.ab-tag-filter-form { width: 45em; } -/*.form-row li label { - display: inline -}*/ .submit-row { line-height: 30px; padding-top: 10px; @@ -1259,12 +1020,7 @@ label.retag-error { font-size: 10px; } -.error-list li { - padding: 5px; -} - .fieldset { -/* border:solid 1px #777;*/ border: none; margin-top: 10px; padding: 10px; @@ -1297,18 +1053,6 @@ label.retag-error { font-size: 120%; } -.openid-samples { - -} - -.openid-samples .list, .list li { - font-family: Trebuchet MS, "segoe ui", Helvetica, "Microsoft YaHei", 宋 体, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif; - list-style: none !important; - margin-left: -30px !important; - line-height: 20px !important; -} - -/*表单相关*/ span.form-error { color: #990000; font-size: 90%; @@ -1375,8 +1119,6 @@ span.form-error { margin: 5px 0 5px 0; } -/*修订记录*/ - .revision { margin: 10px 0 10px 0; width: 100%; @@ -1424,11 +1166,6 @@ span.form-error { font-family: sans-serif; } -.revision .body { - padding-left: 10px; - margin-bottom: 50px; -} - .revision .answerbody { padding: 10px 0 5px 10px; } @@ -1479,11 +1216,6 @@ ins .post-tag { width: 90%; } -.user-edit-link { - background: url(../images/edit.png) no-repeat; - padding-left: 20px; -} - .favorites-count-off { color: #919191; float: left; @@ -1500,12 +1232,15 @@ ins .post-tag { text-align: center; } +/* todo: get rid of this in html */ .favorites-empty { width: 32px; height: 45px; float: left; } +/* paused cleaning here */ + .question-summary { border-bottom: 1px dotted #999999; float: left; diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html index 1054b9db..e67973b1 100644 --- a/askbot/skins/default/templates/answer_edit.html +++ b/askbot/skins/default/templates/answer_edit.html @@ -6,9 +6,9 @@ <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" /> {% endblock %} {% block content %} -<div id="main-bar" class="headNormal"> +<h1> {% trans %}Edit answer{% endtrans %} [<a href="{{ answer.question.get_absolute_url() }}#{{ answer.id }}">{% trans %}back{% endtrans %}</a>] -</div> +</h1> <div id="main-body" class="ask-body"> <div id="askform"> <form id="fmedit" action="{% url edit_answer answer.id %}" method="post" > diff --git a/askbot/skins/default/templates/authopenid/changeemail.html b/askbot/skins/default/templates/authopenid/changeemail.html index d2a34a10..52dc6a0c 100644 --- a/askbot/skins/default/templates/authopenid/changeemail.html +++ b/askbot/skins/default/templates/authopenid/changeemail.html @@ -3,13 +3,13 @@ {% block content %} <!-- changeemail.html action_type={{action_type}}--> {% if action_type=="change" %} - <div id="main-bar" class="headNormal"> + <h1> {% if user.email %} {% trans %}Change email{% endtrans %} {% else %} {% trans %}Save your email address{% endtrans %} {% endif %} - </div> + </h1> <p class="message"> {% if user.email %} {% trans %}change {{email}} info{% endtrans %} diff --git a/askbot/skins/default/templates/authopenid/complete.html b/askbot/skins/default/templates/authopenid/complete.html index 468f293b..ccaf753a 100644 --- a/askbot/skins/default/templates/authopenid/complete.html +++ b/askbot/skins/default/templates/authopenid/complete.html @@ -20,9 +20,7 @@ parameters: {% block head %}{% endblock %} {% block title %}{% spaceless %}{% trans %}Registration{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} - <div id="main-bar" class="headNormal"> - {% trans %}Registration{% endtrans %} - </div> + <h1>{% trans %}Registration{% endtrans %}</h1> <div id="completetxt" > <div class="message"> {% if login_type=='openid' %} diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html index 686068b0..ed985882 100644 --- a/askbot/skins/default/templates/authopenid/signin.html +++ b/askbot/skins/default/templates/authopenid/signin.html @@ -218,8 +218,8 @@ {% block sidebar %}
<div class="boxC">
- <h3 class="subtitle">{% trans %}Why use OpenID?{% endtrans %}</h3>
- <ul class="list-item">
+ <h2>{% trans %}Why use OpenID?{% endtrans %}</h2>
+ <ul>
<li>
{% trans %}with openid it is easier{% endtrans %}
</li>
diff --git a/askbot/skins/default/templates/authopenid/signup_with_password.html b/askbot/skins/default/templates/authopenid/signup_with_password.html index 84b9a792..041633d6 100644 --- a/askbot/skins/default/templates/authopenid/signup_with_password.html +++ b/askbot/skins/default/templates/authopenid/signup_with_password.html @@ -2,9 +2,7 @@ <!--signup.html--> {% block title %}{% spaceless %}{% trans %}Signup{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} -<div class="headNormal"> - {% trans %}Create login name and password{% endtrans %} -</div> +<h1>{% trans %}Create login name and password{% endtrans %}</h1> <p class="message">{% trans %}Traditional signup info{% endtrans %}</p> <form action="{% url user_signup_with_password %}" method="post" accept-charset="utf-8"> {{form.login_provider}} diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html index bbfb6ab3..bbd09951 100644 --- a/askbot/skins/default/templates/badges.html +++ b/askbot/skins/default/templates/badges.html @@ -33,7 +33,6 @@ of times each type of badge has been awarded. Give us feedback at {{feedback_faq {% block sidebar %} <div class="boxC"> <h2>{% trans %}Community badges{% endtrans %}</h2> - <div class="body"> <p> <a style="cursor:default;" title="{% trans %}gold badge: the highest honor and is very rare{% endtrans %}" class="medal"><span class="badge1">●</span> {% trans %}gold{% endtrans %}</a> </p> @@ -56,7 +55,6 @@ of times each type of badge has been awarded. Give us feedback at {{feedback_faq <p> {% trans %}bronze badge description{% endtrans %} </p> - </div> </div> {% endblock %} <!-- end template badges.html --> diff --git a/askbot/skins/default/templates/blocks/answer_edit_tips.html b/askbot/skins/default/templates/blocks/answer_edit_tips.html index 5e9f689a..23e4df53 100644 --- a/askbot/skins/default/templates/blocks/answer_edit_tips.html +++ b/askbot/skins/default/templates/blocks/answer_edit_tips.html @@ -1,8 +1,8 @@ <!-- template answer_edit_tips.html --> <div class="boxC"> - <h3>{% trans %}answer tips{% endtrans %}</h3> + <h2>{% trans %}answer tips{% endtrans %}</h2> <div> - <ul class="list-item"> + <ul> <li> <b>{% trans %}please make your answer relevant to this community{% endtrans %}</b> </li> <li> @@ -22,8 +22,8 @@ </div> <div class="boxC"> - <h3>{% trans %}Markdown tips{% endtrans %}</h3> - <ul class="list-item"> + <h2>{% trans %}Markdown tips{% endtrans %}</h2> + <ul> {% if settings.MARKUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %} <li> {% trans %}*italic*{% endtrans %} diff --git a/askbot/skins/default/templates/blocks/question_edit_tips.html b/askbot/skins/default/templates/blocks/question_edit_tips.html index 2c239115..83c36840 100644 --- a/askbot/skins/default/templates/blocks/question_edit_tips.html +++ b/askbot/skins/default/templates/blocks/question_edit_tips.html @@ -1,26 +1,24 @@ <!-- question_edit_tips.html --> <div class="boxC"> - <h3>{% trans %}question tips{% endtrans %}</h3> - <div> - <ul class="list-item"> - <li> <b>{% trans %}please ask a relevant question{% endtrans %}</b> - </li> - <li> - {% trans %}please try provide enough details{% endtrans %} - </li> - <li> - {% trans %}be clear and concise{% endtrans %} - </li> - </ul> - <p class='info-box-follow-up-links'> - <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">{% trans %}faq{% endtrans %} »</a> - </p> - </div> + <h2>{% trans %}question tips{% endtrans %}</h2> + <ul> + <li> <b>{% trans %}please ask a relevant question{% endtrans %}</b> + </li> + <li> + {% trans %}please try provide enough details{% endtrans %} + </li> + <li> + {% trans %}be clear and concise{% endtrans %} + </li> + </ul> + <p class='info-box-follow-up-links'> + <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">{% trans %}faq{% endtrans %} »</a> + </p> </div> <div class="boxC"> - <h3>{% trans %}Markdown tips{% endtrans %}</h3> - <ul class="list-item"> + <h2>{% trans %}Markdown tips{% endtrans %}</h2> + <ul> {% if settings.MARKDUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %} <li> {% trans %}*italic*{% endtrans %} diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html index 064782c2..20e086a6 100644 --- a/askbot/skins/default/templates/question.html +++ b/askbot/skins/default/templates/question.html @@ -161,14 +161,13 @@ {% if answers %} <hr/> <div class="tabBar"> - <a name="sort-top"></a> - <div class="headUsers"> + <h2 id="sort-top"> {% trans counter=answers|length %} {{counter}} Answer: {% pluralize %} {{counter}} Answers: {% endtrans %} - </div> + </h2> <div class="tabsA"> <a id="oldest" href="{{ question.get_absolute_url() }}?sort=oldest#sort-top" title="{% trans %}oldest answers will be shown first{% endtrans %}">{% trans %}oldest answers{% endtrans %}</a> @@ -331,13 +330,13 @@ {% if not question.closed %} <div style="padding:10px 0 0 0;"> {% spaceless %} - <div class="headNormal"> + <h2> {% if answers %} {% trans %}Your answer{% endtrans %} {% else %} {% trans %}Be the first one to answer this question!{% endtrans %} {% endif %} - </div> + </h2> {% endspaceless %} </div> {% if not request.user.is_authenticated() %} diff --git a/askbot/skins/default/templates/question_retag.html b/askbot/skins/default/templates/question_retag.html index 2606d2c4..3fba16a2 100644 --- a/askbot/skins/default/templates/question_retag.html +++ b/askbot/skins/default/templates/question_retag.html @@ -27,8 +27,8 @@ {% block sidebar %} <div class="boxC"> - <h3>{% trans %}Why use and modify tags?{% endtrans %}</h3> - <ul class="list-item"> + <h2>{% trans %}Why use and modify tags?{% endtrans %}</h2> + <ul> <li>{% trans %}Tags help to keep the content better organized and searchable{% endtrans %}</li> <li> {% trans %}tag editors receive special awards from the community{% endtrans %} diff --git a/askbot/skins/default/templates/user_profile/user_edit.html b/askbot/skins/default/templates/user_profile/user_edit.html index ecdc8809..98da4932 100644 --- a/askbot/skins/default/templates/user_profile/user_edit.html +++ b/askbot/skins/default/templates/user_profile/user_edit.html @@ -3,9 +3,9 @@ <!-- user_edit.html --> {% block title %}{% spaceless %}{% trans %}Edit user profile{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} -<div id="main-bar" class="headNormal"> +<h1> {{ request.user.username }} - {% trans %}edit profile{% endtrans %} -</div> +</h1> <div id="main-body" style="width:100%;padding-top:10px"> <form name="" action="{% url edit_user request.user.id %}" method="post"> <div id="left" style="float:left;width:180px"> |