diff --git a/app/templates/common/topnav.html b/app/templates/common/topnav.html index 7f91051..89defd4 100644 --- a/app/templates/common/topnav.html +++ b/app/templates/common/topnav.html @@ -12,22 +12,19 @@ {% else %} {% with user = get_active_user() %} Welcome, {{user.username}} - • - Settings - • - Inbox - {% if config.DISABLE_SIGNUP and user.can_invite() %} - • - Invite to {{ config.SITE_NAME }} - {% endif %} - {% if not user.is_guest() %} - • - Bookmarks - {% endif %} - {% if user.is_mod() %} - • - User list - {% endif %} + {% endwith %} {% endif %} diff --git a/data/static/css/style.css b/data/static/css/style.css index 776b051..ecc998f 100644 --- a/data/static/css/style.css +++ b/data/static/css/style.css @@ -64,6 +64,13 @@ a:visited { justify-content: space-between; align-items: baseline; } +#topnav ul { + display: inline; + margin-left: 0; +} +#topnav ul li { + display: inline list-item; +} #bottomnav { padding: 10px; @@ -901,10 +908,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus, select:focus display: inline-flex; } -svg.icon { - pointer-events: none; -} - .post-img-container { display: flex; flex-wrap: wrap; diff --git a/data/static/css/theme-otomotone.css b/data/static/css/theme-otomotone.css index f4dac80..dcccd85 100644 --- a/data/static/css/theme-otomotone.css +++ b/data/static/css/theme-otomotone.css @@ -64,6 +64,13 @@ a:visited { justify-content: space-between; align-items: baseline; } +#topnav ul { + display: inline; + margin-left: 0; +} +#topnav ul li { + display: inline list-item; +} #bottomnav { padding: 10px; @@ -901,10 +908,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus, select:focus display: inline-flex; } -svg.icon { - pointer-events: none; -} - .post-img-container { display: flex; flex-wrap: wrap; diff --git a/data/static/css/theme-peachy.css b/data/static/css/theme-peachy.css index d64faa2..af5c3c4 100644 --- a/data/static/css/theme-peachy.css +++ b/data/static/css/theme-peachy.css @@ -64,6 +64,13 @@ a:visited { justify-content: space-between; align-items: baseline; } +#topnav ul { + display: inline; + margin-left: 0; +} +#topnav ul li { + display: inline list-item; +} #bottomnav { padding: 6px; @@ -901,10 +908,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus, select:focus display: inline-flex; } -svg.icon { - pointer-events: none; -} - .post-img-container { display: flex; flex-wrap: wrap; diff --git a/sass/_default.scss b/sass/_default.scss index ca87303..3af0393 100644 --- a/sass/_default.scss +++ b/sass/_default.scss @@ -177,10 +177,20 @@ a{ } $topnav_color: $ACCENT_COLOR !default; +$topnav_list_margin_left: 0 !default; #topnav { @include navbar($topnav_color); justify-content: space-between; align-items: baseline; + + & ul { + display: inline; + margin-left: $topnav_list_margin_left; + } + + & ul li { + display: inline list-item; + } } $bottomnav_color: $DARK_1 !default; @@ -769,7 +779,7 @@ $thread_locked_background: none !default; } svg.icon { - pointer-events: none; + // pointer-events: none; } $post_img_container_gap: $SMALL_PADDING !default;