Some styling tweaks on homepage and member list page, spacing and layout

This commit is contained in:
Oliver Marks 2017-02-12 10:40:20 +00:00
parent 7c2826b0e4
commit 6bedf06f1b
4 changed files with 39 additions and 18 deletions

View File

@ -8,6 +8,8 @@ pipeline:
- DJANGO_SETTINGS_MODULE=config.settings.test - DJANGO_SETTINGS_MODULE=config.settings.test
commands: commands:
- cp -n env.example .env - cp -n env.example .env
- ls -la /drone/src/
- ls -la /drone/src/requirements/
- pip install -r /drone/src/requirements/test.txt - pip install -r /drone/src/requirements/test.txt
- python manage.py test mhackspace --verbosity 2 - python manage.py test mhackspace --verbosity 2

View File

@ -1,11 +1,17 @@
{% load static %} {% load static %}
{% get_static_prefix as STATIC_PREFIX %} {% get_static_prefix as STATIC_PREFIX %}
<h3 class="mb-1">See what our memberrs have been creating below.</h3>
<br />
<div class="card-columns" id="feeds"> <div class="card-columns" id="feeds">
<div class="card-deck">
{% for article in articles %} {% for article in articles %}
<div class="card"> <div class="card">
<a href="{{ article.url }}"> <a href="{{ article.url }}">
<img class="card-img-top img-fluid" alt="{{ article.title }}"
src="{% firstof article.image.home.url article.feed.image.home.url "static/images/card.png" %}"> {% if article.image %}
<img class="card-img-top img-fluid" alt="{{ article.title }}" src="{{ article.image.url }}">
{% endif %}
</a> </a>
<div class="card-block"> <div class="card-block">
<a href="{{ article.url }}" class="card-link"><h4 class="card-title">{{ article.title }}</h4></a> <a href="{{ article.url }}" class="card-link"><h4 class="card-title">{{ article.title }}</h4></a>
@ -14,5 +20,8 @@
<a href="{{ article.url }}" class="card-link">View Original</a> <a href="{{ article.url }}" class="card-link">View Original</a>
</div> </div>
</div> </div>
{% if forloop.counter|divisibleby:3 %}</div><div class="card-deck">{% endif %}
{% endfor %} {% endfor %}
</div>
</div> </div>

View File

@ -1 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %}
<p>A hackspace also referred to as a makerspace is a community-operated, workspace where people with common interests, often in computers, machining, technology, science, digital art or electronic art, can meet, socialize and collaborate.<p>
<p>Most people do no have the space knowleddge or finance required to create things at home, hackspaces get around this by poolng together for the bigger tools sharing of knowledge and helping out each other to create & build.</p>
{% endblock content %}

View File

@ -1,14 +1,16 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
Members feed
<div class="row"> <div class="row">
<div class="col">Users {{ paginator.count }}</div> <div class="col-md-4">Hackspace Members</div>
<div class="col">Members {{ total }}</div> <div class="col-md-4"><a href="#">Total Users <span class="badge badge-default">{{ paginator.count }}</span></a></div>
<div class="col-md-4"><a href="#">Total Members <span class="badge badge-success">{{ total }}</span></a></div>
</div> </div>
<div class="card-deck-wrapper"> <br />
<div class="card-columns" id="feeds">
<div class="card-deck"> <div class="card-deck">
{% for member in members %} {% for member in members %}
<div class="card"> <div class="card">