diff options
-rw-r--r-- | static/css/style.css | 14 | ||||
-rw-r--r-- | templates/identity/view.html | 47 |
2 files changed, 39 insertions, 22 deletions
diff --git a/static/css/style.css b/static/css/style.css index 8f1e620..0755baa 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -287,10 +287,17 @@ form { padding: 20px 40px 20px 30px; } -.right-column form { +.right-column form, +form.inline { padding: 0; } +form.follow { + float: right; + margin: 20px 20px 0 0; + font-size: 16px; +} + form h1 { margin: 0 0 10px 0; } @@ -452,7 +459,7 @@ form .button:hover { /* Identities */ h1.identity { - margin: 0 0 20px 0; + margin: 20px 0 20px 20px; } h1.identity .icon { @@ -475,10 +482,11 @@ h1.identity small { color: var(--color-text-dull); border-radius: 3px; padding: 5px 8px; + margin: 20px; } .system-note a { - color: inherit; + text-decoration: underline; } /* Posts */ diff --git a/templates/identity/view.html b/templates/identity/view.html index 916bee2..e4118c9 100644 --- a/templates/identity/view.html +++ b/templates/identity/view.html @@ -4,12 +4,30 @@ {% block title %}{{ identity }}{% endblock %} {% block content %} + <nav> + <a href="." class="selected">Profile</a> + </nav> + <h1 class="identity"> {% if identity.icon_uri %} <img src="{{identity.icon_uri}}" class="icon"> {% else %} <img src="{% static "img/unknown-icon-128.png" %}" class="icon"> {% endif %} + + {% if request.identity %} + <form action="{{ identity.urls.action }}" method="POST" class="inline follow"> + {% csrf_token %} + {% if follow %} + <input type="hidden" name="action" value="unfollow"> + <button>Unfollow</button> + {% else %} + <input type="hidden" name="action" value="follow"> + <button>Follow</button> + {% endif %} + </form> + {% endif %} + {{ identity.name_or_handle }} <small>@{{ identity.handle }}</small> </h1> @@ -21,27 +39,18 @@ {% else %} <p class="system-note"> This is a member of another server. - <a href="{{ identity.profile_uri }}">See their original profile</a> + <a href="{{ identity.profile_uri }}">See their original profile ➔</a> </p> {% endif %} {% endif %} - {% if request.identity %} - <form action="{{ identity.urls.action }}" method="POST"> - {% csrf_token %} - {% if follow %} - <input type="hidden" name="action" value="unfollow"> - <button>Unfollow</button> - {% else %} - <input type="hidden" name="action" value="follow"> - <button>Follow</button> - {% endif %} - </form> - {% endif %} - - {% for post in posts %} - {% include "activities/_post.html" %} - {% empty %} - No posts yet. - {% endfor %} + <section class="columns"> + <div class="left-column"> + {% for post in posts %} + {% include "activities/_post.html" %} + {% empty %} + No posts yet. + {% endfor %} + </div> + </section> {% endblock %} |