Merge branch 'byron' into new-template

13 files changed, 311 insertions, 194 deletions

diff --git a/askbot/skins/common/media/js/wmd/wmd.css b/askbot/skins/common/media/js/wmd/wmd.css
index 15182541..3ad615e7 100644
--- a/askbot/skins/common/media/js/wmd/wmd.css
+++ b/askbot/skins/common/media/js/wmd/wmd.css
@@ -15,7 +15,7 @@
     border-top:#cce6ec 3px solid;
     border-right:#cce6ec 3px solid;
     float:left;
-    width:100%;
+    width:730px;
 }
 
 #wmd-input 
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index e6d554b1..4f2bad79 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -8,7 +8,7 @@
 @button-label:#4a757f;
 @section-title:#7ea9b3;
 @info-text:#707070;
-@info-text-dark:#6b6b6b;
+@info-text-dark:#525252;
 
 /* Variables for fonts*/
 
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index d2eeb364..1305ed28 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -10,7 +10,7 @@ body {
     margin: 0;
     padding: 0;
     color: #000;
-    font-family: @main-font;
+    font-family:@body-font;
 }
 
 div {
@@ -36,13 +36,13 @@ hr {
 input, select {
     vertical-align: middle;
     font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif;
+    margin-left:0px;
 }
 
 p {
     font-size: 14px;
     line-height: 140%;
     margin-bottom: 6px;
-    padding-left: 5px;
 }
 
 a {
@@ -52,12 +52,12 @@ a {
 }
 
 h2 {
-    font-size: 140%;
+    font-size: 21px;
     padding: 3px 0 3px 5px;
 }
 
 h3 {
-    font-size: 120%;
+    font-size: 19px;
     padding: 3px 0 3px 5px;
 }
 
@@ -142,7 +142,7 @@ a:hover {
 }
 
 h1 {
-    font-size: 160%;
+    font-size: 24px;
     padding: 10px 0 5px 0px;
 }
 
@@ -169,6 +169,7 @@ h1 {
     text-align: center;
     background-color: #f5dd69;
     border-top:#fff 1px solid;
+    font-family:@main-font;
 
     p {
          margin-top: 6px;
@@ -200,6 +201,7 @@ h1 {
 #header {
     margin-top: 0px;
     background: @header-color;
+    font-family:@main-font;
 }
 
 .content-wrapper {/* wrapper positioning class */
@@ -307,6 +309,7 @@ h1 {
     border-bottom:#d3d3c2 1px solid;
     border-top:#fcfcfc 1px solid;
     margin-bottom:10px;
+    font-family:@main-font;
 
     #homeButton{
         border-right:#afaf9e 1px solid;
@@ -453,7 +456,7 @@ h1 {
 
 #ContentFull {
     float: left;
-    width: 950px;
+    width: 960px;
 }
 
 /* ----- Sidebar Widgets Box, check main_page/sidebar.html or question/sidebar.html ----- */
@@ -478,17 +481,19 @@ h1 {
         height:30px;
         line-height:30px;
         text-align:right;
-        font-size:24px;
+        font-size:18px !important;
         font-weight:normal;
         color:#656565;
         padding-right:10px;
         margin-bottom:10px;
+        font-family:@main-font;
     }
     h3{
         color:#4a757f;
         font-size:18px;
         text-align:left;
         font-weight:normal;
+        font-family:@main-font;
     }
     .contributorback{
         background: #eceeeb url(../images/contributorsback.png) no-repeat center left;
@@ -499,7 +504,8 @@ h1 {
         font-size:15px;
         display: block;
         float: right;
-        width: 172px;
+        width: 177px;
+        font-family:@main-font;
     }
 
     ul {
@@ -508,7 +514,7 @@ h1 {
 
     li {
         list-style-type: disc;
-        font-size: 16px;
+        font-size: 13px;
         line-height: 20px;
         margin-bottom: 10px;
         color:@info-text;
@@ -537,13 +543,14 @@ h1 {
             color:@button-label;
             font-weight:bold;
             font-size:12px;
-            width:33px;
+            width:30px;
             height:27px;
             margin-top:-2px;
             cursor:pointer;
             .rounded-corners(4px);
              .text-shadow(0px,1px,0px,#E6F6FA);
-             .box-shadow(1px, 1px, 2px, #808080)
+             .box-shadow(1px, 1px, 2px, #808080);
+             
             
        }
         #interestingTagAdd:hover, #ignoredTagAdd:hover{
@@ -608,6 +615,7 @@ h1 {
     color:@info-text;
     font-size:16px;
     border-bottom:#cccccc 1px solid;
+    font-size:13px;
     
     strong{
         float:right;
@@ -624,13 +632,16 @@ h1 {
         font-weight:normal;
         border-bottom:#cccccc 1px solid;
     }
+    a{
+        font-size:13px;
+    }
 }
 /* tips and markdown help are widgets for ask template */
 
 #tips{
     li{
         color:@info-text;
-       font-size:16px;
+       font-size:13px;
        list-style-image: url(../images/tips.png);
     }
     a{
@@ -641,7 +652,7 @@ h1 {
 #markdownHelp{
     li{
         color:@info-text;
-       font-size:16px;
+       font-size:13px;
     }
     a{
         font-size:16px;
@@ -745,6 +756,7 @@ h1 {
     float:left;
     margin-bottom:8px;
     padding-top:6px;
+    font-family:@main-font;
 }
 
 #listSearchTags{
@@ -752,6 +764,7 @@ h1 {
     margin-top:3px;
     color:@info-text;
     font-size:16px;
+    font-family:@main-font;
 }
 
 ul#searchTags {
@@ -767,6 +780,7 @@ ul#searchTags {
     margin:5px 0 10px 0;
     padding:0px;
     float:left;
+    font-family:@main-font;
 
     a {
         text-decoration: underline;
@@ -802,6 +816,7 @@ ul#searchTags {
         padding-left: 0;
         margin-bottom:8px;
         display:block;
+        font-family:@main-font;
     }
     
     a {
@@ -832,6 +847,7 @@ ul#searchTags {
     .counts {
         float: right;
         margin: 4px 0 0 5px;
+        font-family:@main-font;
     }
     
     .counts .item-count {
@@ -920,7 +936,7 @@ ul#searchTags {
 /* ----- Question list Paginator , check main_content/pager.html and macros/utils_macros.html----- */
 
 .evenMore {
-    font-size: 16px;
+    font-size: 13px;
     color:@info-text;
     padding:15px 0px 10px 0px;
     clear:both;
@@ -944,14 +960,13 @@ ul#searchTags {
 
 .paginator {
     padding: 5px 0 10px 0;
-    font-size:16px;
+    font-size:13px;
 
     .prev a, .prev a:visited,
     .next a, .next a:visited {
          background-color: #fff;
         color: #777;
         padding: 2px 4px 3px 4px;
-        font-family:@main-font;
     }
     a{
         color:@section-title;
@@ -1201,9 +1216,9 @@ span.delete-icon:hover {
     
     p{
        margin:0 0 5px 0;
-       font-size:16px;
+       font-size:14px;
        color:@info-text-dark;
-       line-height:1.2;
+       line-height:1.4;
     }
     .questionTitleInput {
         font-size: 24px;
@@ -1223,11 +1238,14 @@ span.delete-icon:hover {
         border-bottom:#f0f0ec 1px solid;
         float:left;
         margin-bottom:10px;
+        a{
+            line-height:30px;
+        }
 
     }
 
     div#question-list h2 {
-        font-size: 16px;
+        font-size: 13px;
         padding-bottom: 0;
         color:@link;
         border-top:#f0f0ec 1px solid;
@@ -1251,7 +1269,7 @@ span.delete-icon:hover {
     }
     label{
         color:@info-text-dark;
-        font-size:15px;
+        font-size:13px;
     }
 
     #id_tags{
@@ -1265,7 +1283,7 @@ span.delete-icon:hover {
 
 .title-desc {
     color: @info-text;
-    font-size: 15px;
+    font-size: 13px;
 }
 
 #fmanswer input.submit,
@@ -1375,10 +1393,13 @@ span.delete-icon:hover {
     margin: 5px 0 5px 0;
 }
 
-.edit-question-page{
+.edit-question-page, #fmedit{
+    color:@info-text-dark;
+    
     #id_revision{
         font-size:14px;
-        margin-top:10px;
+        margin-top:5px;
+        margin-bottom:5px;
     }
     #id_title{
         font-size: 24px;
@@ -1408,6 +1429,7 @@ span.delete-icon:hover {
 
     h1{
         padding-top:0px;
+       font-family:@main-font;
     }
     
     h1 a{
@@ -1420,11 +1442,11 @@ span.delete-icon:hover {
     p.rss {
         float:none;
         clear:both;
-        padding: 3px 0 0 25px;
+        padding: 3px 0 0 23px;
         font-size: 15px;
         width:110px;
         background-position:center left;
-        margin-left:4px;
+        margin-left:0px !important;
     }
 
     p.rss a {
@@ -1631,6 +1653,7 @@ span.delete-icon:hover {
        color:@section-title;
        width:200px;
        float:left;
+       font-family:@main-font;
     }
     .comments {
         font-size: 12px;    
@@ -1936,13 +1959,24 @@ span.delete-icon:hover {
 
     #fmanswer{
         color:@info-text;
-        font-size:16px;
         line-height:1.2;
         margin-top:10px;
+        p{
+            font-size:13px;
+          line-height:1.3;
+        }
+        h2{
+          font-family:@main-font;
+          color:@section-title;
+          font-size:24px;
+        }
+        label{
+          font-size:13px;
+        }
     }
     .message {
         padding: 5px;
-        margin: 10px 0 10px 0;
+        margin: 0px 0 10px 0;
 
     }
 
@@ -1982,13 +2016,59 @@ span.delete-icon:hover {
 .meta,
 .users-page,
 {
+    font-size:13px;
+    line-height:1.3;
+    color:@info-text-dark;
     p{
-        font-size:15px;
+        font-size:13px;
         color:@info-text;
+        line-height:1.3;
+        font-family:@body-font;
+        color:@info-text-dark;
+        margin-bottom:12px;
     }
     h2{
         color:@info-text-dark;
         padding-left:0px;
+        font-size:16px;
+    }
+    #id_email,#id_name{
+        border:#cce6ec 3px solid;
+        height:25px;
+        padding-left:5px;
+        width:395px;
+        font-size:14px;
+    }
+    textarea{
+        border:#cce6ec 3px solid;
+        padding-left:5px;
+        padding-top:5px;
+        width:395px;
+        font-size:14px;
+    }
+    input.submit{
+        background:url(../images/small-button-blue.png) repeat-x top;
+        border:0;
+        color:@button-label;
+        font-weight:bold;
+        font-size:12px;
+        height:24px;
+        margin-top:-2px;
+        cursor:pointer;
+        .rounded-corners(4px);
+        .text-shadow(0px,1px,0px,#E6F6FA);
+        .box-shadow(1px, 1px, 2px, #808080);
+    }
+    input.submit:hover{
+        background:url(../images/small-button-blue.png) repeat-x bottom;
+        text-decoration:none;
+    }
+    .cancel{
+        background:url(../images/small-button-cancel.png) repeat-x top !important;
+        color:#525252 !important;
+    }
+    .cancel:hover{
+        background:url(../images/small-button-cancel.png) repeat-x bottom !important;
     }
 }
 
@@ -2127,19 +2207,29 @@ a:hover.medal {
 }
 
 .user-profile-page{
-    font-size:15px;
+    font-size:13px;
     color:@info-text-dark;
+
+    p{
+        font-size:13px;
+        line-height:1.3;
+        color:@info-text-dark;
+    }
     .avatar img{
         border:#eee 1px solid;
        padding:5px;
     }
     h2{
         padding:10px 0px 10px 0px;
+        font-family:@main-font;
     }
 }
 
 .user-details {
-    font-size: 15px;
+    font-size: 13px;
+    h3{
+        font-size:16px;
+    }
 }
 
 .user-about {
@@ -2149,15 +2239,11 @@ a:hover.medal {
     overflow: auto;
     padding: 10px;
     width: 90%;
-    p{font-size:18px;}
+    p{font-size:13px;}
 }
 
-.user-info-table td{
-    padding-bottom:5px;
-}
-
-.follow-toggle {
-    border:0;
+.follow-toggle,.submit {
+    border:0 !important;
     color:@button-label;
     font-weight:bold;
     font-size:12px;
@@ -2166,14 +2252,16 @@ a:hover.medal {
     margin-top:-2px;
     font-size:15px;
     cursor:pointer;
+    font-family:@main-font;
     background:url(../images/small-button-blue.png) repeat-x top;
     .rounded-corners(4px);
     .text-shadow(0px,1px,0px,#E6F6FA);
     .box-shadow(1px, 1px, 2px, #808080)
 }
 
-.follow-toggle:hover {
+.follow-toggle:hover, .submit:hover {
     background:url(../images/small-button-blue.png) repeat-x bottom;
+    text-decoration:none !important;
 }
 
 .follow-toggle .follow{
@@ -2196,6 +2284,22 @@ a:hover.medal {
     display:none;
 }
 
+.count {
+    font-family: @main-font;
+    font-size: 200%;
+    font-weight: 700;
+    color: #777
+}
+
+.scoreNumber {
+    font-family: @main-font;
+    font-size: 35px;
+    font-weight: 800;
+    color: #777;
+    line-height: 40px; /*letter-spacing:0px*/
+    margin-top: 3px;
+}
+
 .vote-count {
     font-family: Arial;
     font-size: 160%;
@@ -2225,6 +2329,139 @@ a:hover.medal {
     .rounded-corners(4px);
 }
 
+.karma-summary {
+    padding:5px;
+    font-size:13px;
+}
+
+.karma-summary h3 {
+    text-align: center;
+    font-weight: bold;
+    padding:5px;
+}
+
+.karma-diagram {
+    width:477px;
+    height:300px;
+    float:left;
+    margin-right:10px;
+}
+
+.karma-details {
+    float:right;
+    width:450px;
+    height:250px;
+    overflow-y:auto;
+    word-wrap:break-word;
+    p{margin-bottom:10px;}
+}
+
+.karma-gained {
+    font-weight:bold;
+    background:#eee;
+    width:25px;
+    margin-right:5px;
+    color:green;
+    padding:3px;
+    display:block;
+    float:left;
+    text-align:center;
+    .rounded-corners(3px);
+}
+
+.karma-lost {
+    font-weight:bold;
+    background:#eee;
+    width:25px;
+    color:red;
+    padding:3px;
+    display:block;
+    margin-right:5px;
+    float:left;
+    text-align:center;
+    .rounded-corners(3px);
+}
+
+.submit-row{
+    margin-bottom:10px;
+}
+
+/*-----  Revision pages ----- */
+
+.revision {
+    margin: 10px 0 10px 0;
+    font-size: 13px;
+    color:@info-text-dark;
+    
+    p{
+        font-size:13px;
+        line-height:1.3;
+        color:@info-text-dark;
+    }
+    
+    h3{
+        font-family:@main-font;
+        font-size:21px;
+        padding-left:0px;
+    }
+    
+    .header {
+        background-color: #F5F5F5;
+        padding: 5px;
+        cursor: pointer;
+    }
+
+    .author {
+        background-color: #e9f3f5;
+    }
+
+    .summary {
+        padding: 5px 0 10px 0;
+    }
+
+    .summary span {
+        background-color:#fde785;
+        padding:6px;
+        .rounded-corners(4px);
+        display: inline;
+        .box-shadow(1px, 1px, 4px, #cfb852);
+    }
+
+    .answerbody {
+        padding: 10px 0 5px 10px;
+    }
+
+    .revision-mark {
+        width: 150px;
+        text-align: left;
+        display: inline-block;
+        font-size: 11px;
+        overflow: hidden;
+
+        .gravatar{
+             float:left;
+            margin-right:4px;
+            padding-top:5px;
+        }
+    }
+
+    .revision-number {
+        font-size: 300%;
+        font-weight: bold;
+        font-family: sans-serif;
+    }
+}
+
+del, del .post-tag {
+    color: #C34719;
+}
+
+ins .post-tag, ins p, ins {
+    background-color: #E6F0A2;
+}
+
+/* ----- Red Popup notification ----- */
+
 .vote-notification {
     z-index: 1;
     cursor: pointer;
@@ -2258,6 +2495,7 @@ a:hover.medal {
 
 }
 
+
 /* ----- Footer links , check blocks/footer.html----- */
 
 #ground {
@@ -2267,6 +2505,7 @@ a:hover.medal {
     padding: 6px 0 0 0;
     background: @header-color;
     font-size:16px;
+    font-family:@main-font;
 
     p {
         margin-bottom:0;
@@ -2408,95 +2647,6 @@ span.form-error {
     margin-left: 5px;
 }
 
-.revision {
-    margin: 10px 0 10px 0;
-    width: 100%;
-    font-size: 13px;
-}
-
-.revision .header {
-    background-color: #eee;
-    padding: 5px;
-    cursor: pointer;
-}
-
-.revision .author {
-    background-color: #E9E9FF;
-}
-
-.revision .summary {
-    padding: 5px 0 10px 0;
-}
-
-.revision .summary span {
-    background-color: yellow;
-    padding-left: 3px;
-    padding-right: 3px;
-    display: inline;
-}
-
-.revision h1 {
-    font-size: 130%;
-    font-weight: 600;
-    padding: 15px 0 15px 0;
-}
-
-.revision-mark {
-    width: 200px;
-    text-align: left;
-    display: inline-block;
-    font-size: 90%;
-    overflow: hidden;
-}
-
-.revision-number {
-    font-size: 300%;
-    font-weight: bold;
-    font-family: sans-serif;
-}
-
-.revision .answerbody {
-    padding: 10px 0 5px 10px;
-}
-
-/* Revision pages */
-del {
-    color: #FF5F5F;
-}
-
-del .post-tag {
-    color: #FF5F5F;
-}
-
-ins {
-    background-color: #97ff97;
-}
-
-ins p{
-    background-color: #97ff97;
-}
-
-ins .post-tag {
-    background-color: #97ff97;
-}
-
-/*用户资料页面*/
-.count {
-    font-family: Arial;
-    font-size: 200%;
-    font-weight: 700;
-    color: #777
-}
-
-.scoreNumber {
-    font-family: Arial;
-    font-size: 35px;
-    font-weight: 800;
-    color: #777;
-    line-height: 40px; /*letter-spacing:0px*/
-    margin-top: 3px;
-}
-
 
 /*
 .favorites-count-off {
@@ -2743,7 +2893,7 @@ button::-moz-focus-inner {
 }
 
 .big {
-    font-size: 15px;
+    font-size: 14px;
 }
 
 .strong {
@@ -2957,50 +3107,10 @@ p.signup_p {
 .wmd-preview a {
     color:@link;
 }
+
 .wmd-preview li {
     margin-bottom:7px;
-}
-
-.karma-summary {
-    padding:5px;
-    font-size:13px;
-}
-
-.karma-summary h3 {
-    text-align: center;
-    font-weight: bold;
-    padding:5px;
-}
-
-.karma-diagram {
-    width:377px;
-    height:300px;
-    float:left;
-    margin-right:10px;
-}
-
-.karma-details {
-    float:right;
-    width:300px;
-    height:250px;
-    overflow-y:auto;
-    word-wrap:break-word;
-}
-
-.karma-gained {
-    font-weight:bold;
-    background:#eee;
-    width:20px;
-    color:green;
-    padding:5px;
-}
-
-.karma-lost {
-    font-weight:bold;
-    background:#eee;
-    width:20px;
-    color:red;
-    padding:5px;
+    font-size:14px;
 }
 
 .search-result-summary {
diff --git a/askbot/skins/default/templates/about.html b/askbot/skins/default/templates/about.html
index fce4223e..d5d1b949 100644
--- a/askbot/skins/default/templates/about.html
+++ b/askbot/skins/default/templates/about.html
@@ -2,7 +2,7 @@
 <!-- template about.html -->
 {% block title %}{% spaceless %}{% trans site_name=settings.APP_SHORT_NAME %}About {{site_name}}{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
-<h1>{% trans site_name=settings.APP_SHORT_NAME %}About {{site_name}}{% endtrans %}</h1>
+<h1 class="section-title">{% trans site_name=settings.APP_SHORT_NAME %}About {{site_name}}{% endtrans %}</h1>
 <div class="content">
     {{settings.FORUM_ABOUT}}
 </div>
diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index 168ba784..bbf3edef 100644
--- a/askbot/skins/default/templates/answer_edit.html
+++ b/askbot/skins/default/templates/answer_edit.html
@@ -6,24 +6,25 @@
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
 {% block content %}
-<h1>
+<h1 class="section-title">
     {% trans %}Edit answer{% endtrans %} [<a href="{{ answer.question.get_absolute_url() }}#{{ answer.id }}">{% trans %}back{% endtrans %}</a>]
 </h1>
 <div id="main-body" class="ask-body">
     <form id="fmedit" action="{% url edit_answer answer.id %}" method="post" >{% csrf_token %}
-        <label for="id_revision" ><strong>{% trans %}revision{% endtrans %}:</strong></label> <br/> 
+        <label for="id_revision" >{% trans %}revision{% endtrans %}:</label> <br/> 
         {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul() }}{% endif %}
         <div style="vertical-align:middle">
         {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" value="{% trans %}select revision{% endtrans %}">
         </div>
         {{ macros.edit_post(form) }}
+        {% if settings.WIKI_ON and answer.wiki == False %}
+            {{ macros.checkbox_in_div(form.wiki) }}
+        {% endif %}
         <div class="after-editor">
             <input type="submit" value="{% trans %}Save edit{% endtrans %}" class="submit" />&nbsp;
             <input type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" onclick="history.back(-1);" />
         </div>
-        {% if settings.WIKI_ON and answer.wiki == False %}
-            {{ macros.checkbox_in_div(form.wiki) }}
-        {% endif %}
+
     </form>
 </div>
 {% endblock %}
diff --git a/askbot/skins/default/templates/faq.html b/askbot/skins/default/templates/faq.html
index be25d2ee..51873a06 100644
--- a/askbot/skins/default/templates/faq.html
+++ b/askbot/skins/default/templates/faq.html
@@ -3,6 +3,7 @@
 {% block title %}{% spaceless %}{% trans %}FAQ{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
 <div class="content">
+<h1 class="section-title">FAQ</h1>
     {{forum_faq}}
 </div>
 {% endblock %}
diff --git a/askbot/skins/default/templates/feedback.html b/askbot/skins/default/templates/feedback.html
index d5e8b3a7..60ea2fca 100644
--- a/askbot/skins/default/templates/feedback.html
+++ b/askbot/skins/default/templates/feedback.html
@@ -2,7 +2,7 @@
 <!-- template feedback.html -->
 {% block title %}{% spaceless %}{% trans %}Feedback{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
-<h1>{% trans %}Give us your feedback!{% endtrans %}</h1>
+<h1 class="section-title">{% trans %}Give us your feedback!{% endtrans %}</h1>
 <form method="post" action="{% url feedback %}" accept-charset="utf-8">{% csrf_token %}
     {% if user.is_authenticated() %}
         <p class="message">
@@ -39,7 +39,7 @@
     {{form.next}}
     <div class="submit-row">
         <input type="submit" class="submit" value="{% trans %}Send Feedback{% endtrans %}"/>&nbsp;
-        <input type="submit" class="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}"/>
+        <input type="submit" class="submit cancel" name="cancel" value="{% trans %}Cancel{% endtrans %}"/>
     </div>
 </form>
 {% endblock %}
diff --git a/askbot/skins/default/templates/privacy.html b/askbot/skins/default/templates/privacy.html
index 61f4d945..e9b6f58b 100644
--- a/askbot/skins/default/templates/privacy.html
+++ b/askbot/skins/default/templates/privacy.html
@@ -1,8 +1,8 @@
-{% extends "one_column_body.html" %}
+{% extends "two_column_body.html" %}
 <!-- privacy.html -->
 {% block title %}{% spaceless %}{% trans %}Privacy policy{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
-<h1>{% trans %}Privacy policy{% endtrans %}</h1>
+<h1 class="section-title">{% trans %}Privacy policy{% endtrans %}</h1>
 {{settings.FORUM_PRIVACY}}
 {% endblock %}
 <!-- end privacy.html -->
diff --git a/askbot/skins/default/templates/question/answer_tab_bar.html b/askbot/skins/default/templates/question/answer_tab_bar.html
index 24042b4a..3e39f795 100644
--- a/askbot/skins/default/templates/question/answer_tab_bar.html
+++ b/askbot/skins/default/templates/question/answer_tab_bar.html
@@ -1,11 +1,11 @@
 <div class="tabBar tabBar-answer">
-    <h1 id="questionCount">
+    <h2 id="questionCount">
         {% trans counter=answers|length %}
         {{counter}} Answer
         {% pluralize %}
         {{counter}} Answers
         {% endtrans %}
-    </h1>
+    </h2>
     <div class="tabsA">
         <span class="label">
         Sort by »
diff --git a/askbot/skins/default/templates/revisions.html b/askbot/skins/default/templates/revisions.html
index 0c10e6d4..7fb985e2 100644
--- a/askbot/skins/default/templates/revisions.html
+++ b/askbot/skins/default/templates/revisions.html
@@ -3,7 +3,7 @@
 <!-- revisions.html -->
 {% block title %}{% spaceless %}{% trans %}Revision history{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
-<h1>
+<h1 class="section-title">
     {% trans %}Revision history{% endtrans %} [<a href="{{ post.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]
 </h1>
 <div id="revisions">
diff --git a/askbot/skins/default/templates/user_profile/user.html b/askbot/skins/default/templates/user_profile/user.html
index 6ec4bc3a..1693303e 100644
--- a/askbot/skins/default/templates/user_profile/user.html
+++ b/askbot/skins/default/templates/user_profile/user.html
@@ -1,4 +1,4 @@
-{% extends "two_column_body.html" %}
+{% extends "one_column_body.html" %}
 <!-- user.html -->
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
diff --git a/askbot/skins/default/templates/user_profile/user_reputation.html b/askbot/skins/default/templates/user_profile/user_reputation.html
index 99b304d2..0deb2b97 100644
--- a/askbot/skins/default/templates/user_profile/user_reputation.html
+++ b/askbot/skins/default/templates/user_profile/user_reputation.html
@@ -8,16 +8,17 @@
             <div id="diagram" class="karma-diagram"></div>
             <div class="karma-details">
                 {% if view_user.id == user.id %}
-                <h3>{% trans %}Your karma change log.{% endtrans %}</h3>
+                <h2>{% trans %}Your karma change log.{% endtrans %}</h2>
                 {% else %}
-                <h3>{% trans user_name=view_user.username %}{{user_name}}'s karma change log{% endtrans %}</h3>
+                <h2>{% trans user_name=view_user.username %}{{user_name}}'s karma change log{% endtrans %}</h2>
                 {% endif %}
                 {% for rep in reputation %}
                 <p>
                     <span class="karma-gained">{{ rep.positive }}</span>
                     <span class="karma-lost">{{ rep.negative }}</span>
                     {{ rep.get_explanation_snippet() }}
-                    <span class="small">({{rep.reputed_at|diff_date}})</span>                    
+                    <span class="small">({{rep.reputed_at|diff_date}})</span>
+                    <div class="clean"></div>                  
                 </p>
                 {% endfor %}
             </div>
diff --git a/askbot/skins/default/templates/widgets/answer_edit_tips.html b/askbot/skins/default/templates/widgets/answer_edit_tips.html
index 23e4df53..9cf0606e 100644
--- a/askbot/skins/default/templates/widgets/answer_edit_tips.html
+++ b/askbot/skins/default/templates/widgets/answer_edit_tips.html
@@ -1,8 +1,8 @@
 <!-- template answer_edit_tips.html -->
-<div class="boxC">
+<div class="box">
     <h2>{% trans %}answer tips{% endtrans %}</h2>
-    <div>
-        <ul>
+    <div id="tips">
+        <ul >
             <li> <b>{% trans %}please make your answer relevant to this community{% endtrans %}</b>
             </li>
             <li>
@@ -16,12 +16,14 @@
             </li>
         </ul>
         <p class='info-box-follow-up-links'>
-            <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">faq »</a>
+<!-- will be change to a popup windows
+        <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">{% trans %}FAQ{% endtrans %} »</a>
+-->
         </p>
     </div>
 </div>
 
-<div class="boxC">
+<div class="box">
     <h2>{% trans %}Markdown tips{% endtrans %}</h2>
     <ul>
         {% if settings.MARKUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %}
@@ -57,7 +59,9 @@
         </li>
     </ul>
     <p class='info-box-follow-up-links'>
+<!-- will be change to a popup windows
         <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans %}learn more about Markdown{% endtrans %} »</a>
+-->
     </p>
 </div>
 <!-- end template answer_edit_tips.html -->