sh4nks 9 лет назад
Родитель
Сommit
8e60013d0c

+ 1 - 1
flaskbb/templates/macros.html

@@ -386,7 +386,7 @@
 {%- if topic_pages >  1 -%}
 {%- if topic_pages >  1 -%}
 [
 [
     {%- for page in range(0, topic_pages) -%}
     {%- for page in range(0, topic_pages) -%}
-            <a href="{{ url_for('forum.view_topic', topic_id=topic_obj.id) }}?page={{ page+1 }}">{{ page+1 }} </a>
+            <a href="{{ url_for('forum.view_topic', topic_id=topic_obj.id) }}?page={{ page+1 }}">{{ page+1 }}</a>{% if not loop.last %} {% endif %}
     {%- endfor -%}
     {%- endfor -%}
 ]
 ]
 {%- endif -%}
 {%- endif -%}

+ 6 - 2
flaskbb/themes/aurora/src/flaskbb.scss

@@ -349,6 +349,7 @@ body {
                     font-weight: bold;
                     font-weight: bold;
                 }
                 }
                 .topic-pages {
                 .topic-pages {
+                    font-weight: normal;
                     font-size: small;
                     font-size: small;
                 }
                 }
             }
             }
@@ -531,20 +532,23 @@ p.flaskbb-stats {
     }
     }
 
 
     & > .md-footer, & >.md-header {
     & > .md-footer, & >.md-header {
-        background: #F6F9FC;
+        background: $navigation-background-color;
     }
     }
 
 
     & >textarea {
     & >textarea {
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+        font-size: 1em;
         border-top: 1px solid $border-color;
         border-top: 1px solid $border-color;
         border-bottom: none;
         border-bottom: none;
         background: #fff;
         background: #fff;
-        padding-left: 3px;
+        padding: 0 0.25em;
     }
     }
 
 
     & >.md-preview {
     & >.md-preview {
         border-top: 1px solid $border-color;
         border-top: 1px solid $border-color;
         border-right: 1px solid $border-color;
         border-right: 1px solid $border-color;
         border-bottom: none;
         border-bottom: none;
+        padding: 0 0.25em;
         background: #eee;
         background: #eee;
     }
     }
 }
 }

+ 6 - 2
flaskbb/themes/aurora/static/css/flaskbb.css

@@ -187,6 +187,7 @@ body {
       .forum-panel .forum-body .forum-row .topic-info .topic-name {
       .forum-panel .forum-body .forum-row .topic-info .topic-name {
         font-weight: bold; }
         font-weight: bold; }
       .forum-panel .forum-body .forum-row .topic-info .topic-pages {
       .forum-panel .forum-body .forum-row .topic-info .topic-pages {
+        font-weight: normal;
         font-size: small; }
         font-size: small; }
 
 
 .category-panel {
 .category-panel {
@@ -304,16 +305,19 @@ p.flaskbb-stats {
   border-color: none;
   border-color: none;
   box-shadow: none; }
   box-shadow: none; }
 .editor > .md-editor > .md-footer, .editor > .md-editor > .md-header {
 .editor > .md-editor > .md-footer, .editor > .md-editor > .md-header {
-  background: #F6F9FC; }
+  background: #f8f8f8; }
 .editor > .md-editor > textarea {
 .editor > .md-editor > textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 1em;
   border-top: 1px solid #cad7e1;
   border-top: 1px solid #cad7e1;
   border-bottom: none;
   border-bottom: none;
   background: #fff;
   background: #fff;
-  padding-left: 3px; }
+  padding: 0 0.25em; }
 .editor > .md-editor > .md-preview {
 .editor > .md-editor > .md-preview {
   border-top: 1px solid #cad7e1;
   border-top: 1px solid #cad7e1;
   border-right: 1px solid #cad7e1;
   border-right: 1px solid #cad7e1;
   border-bottom: none;
   border-bottom: none;
+  padding: 0 0.25em;
   background: #eee; }
   background: #eee; }
 
 
 .emoji {
 .emoji {

+ 2 - 2
flaskbb/themes/aurora/templates/forum/topic.html

@@ -154,8 +154,8 @@
     <form class="form" action="#" method="post">
     <form class="form" action="#" method="post">
         {{ form.hidden_tag() }}
         {{ form.hidden_tag() }}
         <div class="row">
         <div class="row">
-            <div class="editor-box col-md-offset-2 col-sm-offset-2 col-md-10 col-sm-10 col-xs-12">
-                <div class="editor col-md-12 col-sm-12 col-xs-12">
+            <div class="editor-box col-md-offset-2 col-sm-offset-3 col-md-10 col-sm-10 col-xs-12">
+                <div class="editor col-md-12 col-sm-11 col-xs-12">
                         {{ render_quickreply(form.content, div_class="new-message", rows=7, cols=75, placeholder="", **{'data-provide': 'markdown', 'data-autofocus': 'false', 'id': 'quickreply-editor'}) }}
                         {{ render_quickreply(form.content, div_class="new-message", rows=7, cols=75, placeholder="", **{'data-provide': 'markdown', 'data-autofocus': 'false', 'id': 'quickreply-editor'}) }}
                 </div>
                 </div>
                 <div class="editor-submit">
                 <div class="editor-submit">