Merge pull request #149 from boothy060590/issue-146/wiki_alignment_issues_mobile

Fixed styling issues

mhackspace/templates/wiki/article.html

@@ -0,0 +1,51 @@
+{% extends "wiki/base.html" %}
+{% load wiki_tags i18n sekizai_tags %}
+
+
+{% block wiki_pagetitle %}{{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_breadcrumbs %}
+    {% include "wiki/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block wiki_contents %}
+    <div id="article-container" class="container-fluid">
+        <div class="row inline-group" id="article-title">
+            <div class="col-sm-2 float-left" id="article-title-li">
+                <h1 id="article-title">
+                    {{ article.current_revision.title }}
+                    <small style="font-size: 14px;">
+                        {% if urlpath.parent %}
+                            <a href="{% url 'wiki:get' path=urlpath.path %}"><span
+                                    class="fa fa-bookmark"></span> {{ urlpath.slug }}</a>
+                        {% endif %}
+                        {% if article.current_revision.locked %}
+                            <span class="fa fa-lock"></span> {% trans "locked" %}
+                        {% endif %}
+                    </small>
+                </h1>
+            </div>
+
+        </div>
+
+        <div class="row inline-group" id="article-contents">
+            <div class="col-sm-2 float-left" id="article-contents-li">
+                {% block wiki_contents_tab %}
+                {% endblock %}
+            </div>
+        </div>
+
+    </div>
+    <div class="row inline-group" id="article-menu">
+        <div class="col-sm-12 float-left" id="article-contents-li">
+            {% include "wiki/includes/article_menu.html" %}
+
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block wiki_footer_prepend %}
+    <p style="margin-bottom: 10px;">
+        <em>{% trans "This article was last modified:" %} {{ article.current_revision.modified }}</em></p>
+{% endblock %}

mhackspace/templates/wiki/includes/article_menu.html

@@ -2,53 +2,53 @@
 
 {% with selected_tab as selected %}
 
-<li class="nav-item pull-xs-right{% if selected == "settings" %} active{% endif %}">
+<div class="col-sm-2 pull-xs-right{% if selected == "settings" %} active{% endif %} list-inline-item">
   {% if not user.is_anonymous %}
   <a class="nav-link" href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}" role="button">
     <span class="fa fa-wrench"></span>
     <span class="hidden-xs">{% trans "Settings" %}</span>
   </a>
   {% endif %}
-</li>
+</div>
 
 {% for plugin in article_tabs %}
-  <li class="nav-item pull-xs-right{% if selected == plugin.slug %} active{% endif %}">
+  <div class="col-sm-2 pull-xs-right{% if selected == plugin.slug %} active{% endif %} list-inline-item">
     <a class="nav-link" href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}" role="button">
       <span class="{{ plugin.article_tab.1 }}"></span>
       <span class="hidden-xs">{{ plugin.article_tab.0 }}</span>
     </a>
-  </li>
+  </div>
 {% endfor %}
 
-<li class="nav-item pull-xs-right{% if selected == "history" %} active{% endif %}">
+<div class="col-sm-2 pull-xs-right{% if selected == "history" %} active{% endif %} list-inline-item">
   <a class="nav-link" href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}" role="button">
     <span class="fa fa-clock-o"></span>
     <span class="hidden-xs">{% trans "Changes" %}</span>
   </a>
-</li>
+</div>
 
 {% if article|can_write:user and not article.current_revision.locked %}
-<li class="nav-item pull-xs-right{% if selected == "edit" %} active{% endif %}">
+<div class="col-sm-2 pull-xs-right{% if selected == "edit" %} active{% endif %} list-inline-item">
   <a class="nav-link" href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}" role="button">
     <span class="fa fa-edit"></span>
     <span class="hidden-xs">{% trans "Edit" %}</span>
   </a>
-</li>
+</div>
 {% else %}
-<li class="nav-item pull-xs-right{% if selected == "source" %} active{% endif %}">
+<div class="col-sm-2 pull-xs-right{% if selected == "source" %} active{% endif %} list-inline-item">
   <a class="nav-link" href="{% url 'wiki:source' article_id=article.id path=urlpath.path %}" role="button">
     <span class="fa fa-lock"></span>
     <span class="hidden-xs">{% trans "View Source" %}</span>
   </a>
-</li>
+</div>
 {% endif %}
 
-<li class="nav-item pull-xs-right{% if selected == "view" %} active{% endif %}">
+<div class="col-sm-2 pull-xs-right{% if selected == "view" %} active{% endif %} list-inline-item">
   <a class="nav-link" href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}" role="button">
     <span class="fa fa-home"></span>
     <span class="hidden-xs">{% trans "View" %}</span>
   </a>
-</li>
+</div>
 
 
 {% endwith %}