From 2693ba57c857687a02d3ac1c9fd8217e04f6d719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= Date: Sun, 7 Jul 2019 09:22:55 +0200 Subject: [PATCH] Improve mobile layout --- bookmarks/styles/base.scss | 25 +++++++++----- bookmarks/templates/bookmarks/edit.html | 2 +- bookmarks/templates/bookmarks/index.html | 4 +-- bookmarks/templates/bookmarks/layout.html | 38 ++++++++++++++++++--- bookmarks/templates/bookmarks/new.html | 2 +- bookmarks/templates/registration/login.html | 4 +-- bookmarks/templates/settings/index.html | 2 +- 7 files changed, 57 insertions(+), 20 deletions(-) diff --git a/bookmarks/styles/base.scss b/bookmarks/styles/base.scss index ce3b6bc..50f6268 100644 --- a/bookmarks/styles/base.scss +++ b/bookmarks/styles/base.scss @@ -1,22 +1,29 @@ body { - margin: 20px 0; + margin: 20px 10px; } header { margin-bottom: 40px; } -.navbar-brand { +.navbar { - .logo { - background-color: $primary-color; - color: $light-color; - padding: 14px; + .navbar-brand { + + .logo { + background-color: $primary-color; + color: $light-color; + padding: 14px; + } + + h1 { + text-transform: uppercase; + display: inline-block; + } } - h1 { - text-transform: uppercase; - display: inline-block; + .dropdown-toggle { + padding: 0; } } diff --git a/bookmarks/templates/bookmarks/edit.html b/bookmarks/templates/bookmarks/edit.html index fd15693..7d5c795 100644 --- a/bookmarks/templates/bookmarks/edit.html +++ b/bookmarks/templates/bookmarks/edit.html @@ -7,7 +7,7 @@

Edit bookmark

-
+ {% bookmark_form form %}
diff --git a/bookmarks/templates/bookmarks/index.html b/bookmarks/templates/bookmarks/index.html index 01ecf59..c24ac4b 100644 --- a/bookmarks/templates/bookmarks/index.html +++ b/bookmarks/templates/bookmarks/index.html @@ -6,7 +6,7 @@
{# Bookmark list #} -
+

Bookmarks

@@ -28,7 +28,7 @@
{# Tag list #} -
+

Tags

diff --git a/bookmarks/templates/bookmarks/layout.html b/bookmarks/templates/bookmarks/layout.html index de7c99a..4a38e36 100644 --- a/bookmarks/templates/bookmarks/layout.html +++ b/bookmarks/templates/bookmarks/layout.html @@ -5,6 +5,10 @@ + + + + linkding {# Include SASS styles, files are resolved from bookmarks/styles #} @@ -21,10 +25,36 @@ {# Only nav items menu when logged in #} {% if request.user.is_authenticated %}
- Add bookmark - Bookmarklet - Settings - Logout + {# Basic menu list #} +
+ Add bookmark + Bookmarklet + Settings + Logout +
+ {# Menu drop-down for smaller devices #} +
+
+ + + + + +
+
{% endif %} diff --git a/bookmarks/templates/bookmarks/new.html b/bookmarks/templates/bookmarks/new.html index 5cbc9fa..1c9d08b 100644 --- a/bookmarks/templates/bookmarks/new.html +++ b/bookmarks/templates/bookmarks/new.html @@ -7,7 +7,7 @@

New bookmark

-
+ {% bookmark_form form auto_close %}
diff --git a/bookmarks/templates/registration/login.html b/bookmarks/templates/registration/login.html index 7c753ba..5ea46cd 100644 --- a/bookmarks/templates/registration/login.html +++ b/bookmarks/templates/registration/login.html @@ -7,7 +7,7 @@
diff --git a/bookmarks/templates/settings/index.html b/bookmarks/templates/settings/index.html index 6ff427c..150dbd1 100644 --- a/bookmarks/templates/settings/index.html +++ b/bookmarks/templates/settings/index.html @@ -13,7 +13,7 @@
{% csrf_token %}
-
+