Cleanup and some fixes

flaskbb/themes/aurora/src/flaskbb.scss

@@ -175,7 +175,6 @@ body {
 .category-panel, .forum-panel, .topic-panel, .page-panel {
     border: 1px solid $panel-border;
     border-radius: 0;
-    margin-bottom: 0;
     .category-head, .forum-head, .topic-head, .page-head {
         background-color: $panel-head-background;
         font-weight: bold;
@@ -206,6 +205,10 @@ body {
 
 
 // Topic
+.topic-panel {
+    margin-bottom: 0;
+}
+
 .topic-body {
     .post-row {
         background: $author-box-background;
@@ -320,6 +323,7 @@ body {
 // forum specific values
 .forum-panel {
     border: 1px solid $forum-border;
+    margin-bottom: 0;
 
     .forum-head {
         background-color: $forum-head-background;
@@ -424,11 +428,15 @@ body {
             background-color: $page-meta-background;
             border-bottom: 1px solid $page-meta-border;
         }
-        .page-row {
+        .row > .page-row {
             &:not(:last-child) {
                 border-bottom: 1px solid $page-border;
             }
         }
+        // if no meta information is to show, reset padding-top
+        & > :not(.page-meta) {
+            padding-top: 0.5em;
+        }
     }
 }
 
@@ -555,8 +563,11 @@ p.flaskbb-stats {
     margin: 0.75em 0.25em 0 0;
 }
 
-.editor {
+.editor-box > .quickreply {
     padding: 0;
+}
+
+.editor {
     min-height: 0;
 
     .editor-options {

flaskbb/themes/aurora/templates/forum/memberlist.html

@@ -4,35 +4,35 @@
 {% block content %}
 {% from theme('macros.html') import render_pagination, group_field %}
 
-<div class="page-view">
-    <ol class="breadcrumb flaskbb-breadcrumb">
-        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-        <li class="active">{% trans %}Memberlist{% endtrans %}</li>
-    </ol>
+<ol class="breadcrumb flaskbb-breadcrumb">
+    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+    <li class="active">{% trans %}Memberlist{% endtrans %}</li>
+</ol>
 
-    <div class="row controls-row">
-        <div class="col-md-8 col-sm-8 col-xs-8 controls-col">
-            <div class="pull-left">
-                {{ render_pagination(users, url_for('forum.memberlist')) }}
-            </div>
+<div class="row controls-row">
+    <div class="col-md-8 col-sm-8 col-xs-8 controls-col">
+        <div class="pull-left">
+            {{ render_pagination(users, url_for('forum.memberlist')) }}
         </div>
-        <div class="col-md-4 col-sm-4 col-xs-4 controls-col">
-            <div class="pull-right">
-              <form class="inline-form" role="form" method="post">
-                  <div class="input-group">
-                      {{ search_form.hidden_tag() }}
-                      {{ group_field(search_form.search_query) }}
-                      <span class="input-group-btn">
-                        <button class="btn btn-primary" type="submit">{% trans %}Search{% endtrans %}</button>
-                      </span>
-                  </div>
-              </form>
-            </div>
+    </div>
+    <div class="col-md-4 col-sm-4 col-xs-4 controls-col">
+        <div class="pull-right">
+          <form class="inline-form" role="form" method="post">
+              <div class="input-group">
+                  {{ search_form.hidden_tag() }}
+                  {{ group_field(search_form.search_query) }}
+                  <span class="input-group-btn">
+                    <button class="btn btn-primary" type="submit">{% trans %}Search{% endtrans %}</button>
+                  </span>
+              </div>
+          </form>
         </div>
     </div>
+</div>
 
-    <div class="panel panel-default forum-panel">
-        <div class="panel-heading forum-head">
+<div class="page-view">
+    <div class="panel panel-default page-panel">
+        <div class="panel-heading page-head">
             <a href="{{ url_for('forum.memberlist') }}">{% trans %}Memberlist{% endtrans %}</a>
         </div>
         <div class="panel-body page-body">

flaskbb/themes/aurora/templates/forum/topic.html

@@ -16,7 +16,6 @@
     <li class="active">{{ topic.title }}</li>
 </ol>
 
-
 <div class="topic-view">
     {% include theme('forum/topic_controls.html') %}
 
@@ -154,17 +153,19 @@
     <form class="form" action="#" method="post">
         {{ form.hidden_tag() }}
         <div class="row">
-            <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'}) }}
-                </div>
-                <div class="editor-submit">
-                    <div class="editor-options pull-left">
-                        <span class="label label-info">Markdown</span>
-                        <a class="label label-success" href="#">help</a> <!-- TODO: add markdown cheat sheet -->
-                        <a class="label label-success" href="#">emojis</a> <!-- TODO: add emoji cheat sheet -->
+            <div class="col-md-offset-2 col-sm-offset-3 col-md-10 col-sm-9 col-xs-12">
+                <div class="editor-box">
+                    <div class="editor quickreply">
+                            {{ render_quickreply(form.content, div_class="new-message", rows=7, cols=75, placeholder="", **{'data-provide': 'markdown', 'data-autofocus': 'false', 'id': 'quickreply-editor'}) }}
+                    </div>
+                    <div class="editor-submit">
+                        <div class="editor-options pull-left">
+                            <span class="label label-info">Markdown</span>
+                            <a class="label label-success" href="#">help</a> <!-- TODO: add markdown cheat sheet -->
+                            <a class="label label-success" href="#">emojis</a> <!-- TODO: add emoji cheat sheet -->
+                        </div>
+                        {{ render_submit_field(form.submit, input_class="btn btn-success pull-right") }}
                     </div>
-                    {{ render_submit_field(form.submit, input_class="btn btn-success pull-right") }}
                 </div>
             </div>
         </div>

flaskbb/themes/aurora/templates/forum/topictracker.html

@@ -8,12 +8,12 @@
 <form class="form" role="form" method="POST">
     <div style="display:none;"><input id="csrf_token" name="csrf_token" type="hidden" value="{{ csrf_token() }}"></div>
 
-    <div class="forum-view">
-        <ol class="breadcrumb flaskbb-breadcrumb">
-            <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-            <li class="active">{% trans %}Topic Tracker{% endtrans %}</li>
-        </ol>
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li class="active">{% trans %}Topic Tracker{% endtrans %}</li>
+    </ol>
 
+    <div class="forum-view">
         <div class="row controls-row">
             <div class="pull-left">
                 {{ render_pagination(topics, url_for('forum.topictracker')) }}

flaskbb/themes/aurora/templates/user/profile.html

@@ -1,12 +1,11 @@
 {% extends theme("layout.html") %}
 {% block content %}
+<ul class="breadcrumb flaskbb-breadcrumb">
+    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+    <li class="active">{{ user.username }}</li>
+</ul>
 
-    <ul class="breadcrumb flaskbb-breadcrumb">
-        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-        <li class="active">{{ user.username }}</li>
-    </ul>
-
-
+<div class="page-view">
     <div class="row">
         <!-- left column -->
         <div class="col-md-2 col-sm-3 col-xs-12">
@@ -16,34 +15,35 @@
                 </div>
 
                 <div class="panel-body page-body">
-                    <div class="profile-picture">
-                        {% if user.avatar %}
-                        <img src="{{ user.avatar }}" alt="Avatar" class="profile-avatar">
-                        {% endif %}
-                    </div>
-
-                    <div class="profile-online">
-                        {% if user|is_online %}
-                        <span class="label label-success">Online</span>
-                        {% else %}
-                        <span class="label label-default">Offline</span>
-                        {% endif %}
-                    </div>
-
-                    <div class="profile-pm">
-                        {% if current_user.is_authenticated() %}
-                        <a href="{{ url_for('message.new_conversation') }}?to_user={{ user.username }}">{% trans %}Send a Message{% endtrans %}</a>
-                        {% endif %}
-                    </div>
-
-                    <div class="profile-topics">
-                        <a href="{{ url_for('user.view_all_topics', username=user.username) }}">{% trans %}All Topics{% endtrans %}</a>
-                    </div>
-
-                    <div class="profile-posts">
-                        <a href="{{ url_for('user.view_all_posts', username=user.username) }}">{% trans %}All Posts{% endtrans %}</a>
+                    <div class="col-md-12 col-sm-12 col-xs-12 profile-stats">
+                        <div class="profile-picture">
+                            {% if user.avatar %}
+                            <img src="{{ user.avatar }}" alt="Avatar" class="profile-avatar">
+                            {% endif %}
+                        </div>
+
+                        <div class="profile-online">
+                            {% if user|is_online %}
+                            <span class="label label-success">Online</span>
+                            {% else %}
+                            <span class="label label-default">Offline</span>
+                            {% endif %}
+                        </div>
+
+                        <div class="profile-pm">
+                            {% if current_user.is_authenticated() %}
+                            <a href="{{ url_for('message.new_conversation') }}?to_user={{ user.username }}">{% trans %}Send a Message{% endtrans %}</a>
+                            {% endif %}
+                        </div>
+
+                        <div class="profile-topics">
+                            <a href="{{ url_for('user.view_all_topics', username=user.username) }}">{% trans %}All Topics{% endtrans %}</a>
+                        </div>
+
+                        <div class="profile-posts">
+                            <a href="{{ url_for('user.view_all_posts', username=user.username) }}">{% trans %}All Posts{% endtrans %}</a>
+                        </div>
                     </div>
-
                 </div>
             </div> <!-- end profile widget -->
         </div> <!-- end col -->
@@ -54,13 +54,13 @@
             <div class="panel panel-default page-panel">
                 <div class="panel-heading page-head">{% trans %}Info{% endtrans %}</div>
                 <div class="panel-body page-body">
-
+                    <div class="col-md-12 col-sm-12 col-xs-12 profile-field">
                     {% if user.notes %}
                         {{ user.notes|markup|safe }}
                     {% else %}
                         {% trans %}User has not added any notes about him.{% endtrans %}
                     {% endif %}
-
+                    </div>
                 </div>
             </div> <!-- end profile widget -->
 
@@ -68,9 +68,9 @@
             <div class="panel panel-default page-panel">
                 <div class="panel-heading page-head">{% trans %}Signature{% endtrans %}</div>
                 <div class="panel-body page-body">
-
-                    {{ user.signature|markup|safe }}
-
+                    <div class="col-md-12 col-sm-12 col-xs-12 profile-field">
+                        {{ user.signature|markup|safe }}
+                    </div>
                 </div>
             </div> <!-- end profile widget -->
             {% endif %}
@@ -80,30 +80,30 @@
         <!-- right column -->
         <div class="col-md-3 col-sm-4 col-xs-12">
             <div class="panel panel-default page-panel">
-                <div class="panel-heading panel-widget-heading">{% trans %}User Stats{% endtrans %}</div>
-                <div class="panel-body panel-widget-body">
+                <div class="panel-heading page-page">{% trans %}User Stats{% endtrans %}</div>
+                <div class="panel-body page-body">
 
-                <div class="profile-stats-field">
+                    <div class="profile-stats">
                         <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Group{% endtrans %}:</p></div>
                         <div class="col-md-7 col-sm-6 col-xs-6"><p>{{ user.primary_group.name }}</p></div>
                     </div>
 
-                    <div class="profile-stats-field">
+                    <div class="profile-stats">
                         <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Joined{% endtrans %}:</p></div>
                         <div class="col-md-7 col-sm-6 col-xs-6"><p>{{ user.date_joined|format_date('%b %d %Y') }}</p></div>
                     </div>
 
-                    <div class="profile-stats-field">
+                    <div class="profile-stats">
                         <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Posts{% endtrans %}:</p></div>
                         <div class="col-md-7 col-sm-6 col-xs-6"><p>{{ user.post_count }} ({{ user.posts_per_day }} per day)</p></div>
                     </div>
 
-                    <div class="profile-stats-field">
+                    <div class="profile-stats">
                         <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Last seen{% endtrans %}:</p></div>
                         <div class="col-md-7 col-sm-6 col-xs-6"><p>{%- if user.lastseen -%} {{ user.lastseen|time_since }} {%- else -%} {% trans %}Never seen{% endtrans %} {%- endif -%}</p></div>
                     </div>
 
-                    <div class="profile-stats-field">
+                    <div class="profile-stats">
                         <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Last post{% endtrans %}:</p></div>
                         <div class="col-md-7 col-sm-6 col-xs-6"><p>
                             {%- if user.last_post -%}
@@ -114,12 +114,12 @@
                       </p></div>
                     </div>
 
-                    <div class="profile-stats-field">
+                    <div class="profile-stats">
                       <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Location{% endtrans %}:</p></div>
                       <div class="col-md-7 col-sm-6 col-xs-6"><p>{%- if user.location -%} {{ user.location }} {%- else -%} {% trans %}No Info{% endtrans %} {%- endif -%}</p></div>
                     </div>
 
-                    <div class="profile-stats-field">
+                    <div class="profile-stats">
                       <div class="col-md-5 col-sm-6 col-xs-6"><p class="stats-right">{% trans %}Birthday{% endtrans %}:</p></div>
                       <div class="col-md-7 col-sm-6 col-xs-6"><p>{% if user.birthday %} {{ user.birthday|format_date('%b %d %Y') }} {% else %} {% trans %}No Info{% endtrans %} {% endif %} {% if user.gender %} ({{ user.gender }}) {% endif %}</p></div>
                     </div>
@@ -129,6 +129,5 @@
 
         </div> <!-- end col -->
     </div> <!-- end row -->
-
 </div>
 {% endblock %}