mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-12 18:25:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into detail-menus

Browse source
This commit is contained in:
Mouse Reeve 2021-12-04 11:30:49 -08:00 committed by GitHub
commit 403382e4b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 88 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,6 +4,7 @@
*.swp *.swp
**/__pycache__ **/__pycache__
.local .local
/nginx/nginx.conf
# VSCode # VSCode
/.vscode /.vscode

14
bookwyrm/static/css/bookwyrm.css
View file

@ -117,6 +117,20 @@ input[type=file]::file-selector-button:hover {
details .dropdown-menu { details .dropdown-menu {
display: block !important; display: block !important;
summary::marker {
content: none;
}
.detail-pinned-button summary {
position: absolute;
right: 0;
}
.detail-pinned-button form {
float: left;
width: -webkit-fill-available;
margin-top: 1em;
} }
/** Shelving /** Shelving

23
bookwyrm/templates/feed/feed.html
View file

@ -6,7 +6,9 @@
<h1 class="title"> <h1 class="title">
{{ tab.name }} {{ tab.name }}
</h1> </h1>
<div class="tabs"> <div class="block is-clipped">
<div class="is-pulled-left">
<div class="tabs">
<ul> <ul>
{% for stream in streams %} {% for stream in streams %}
<li class="{% if tab.key == stream.key %}is-active{% endif %}"{% if tab.key == stream.key %} aria-current="page"{% endif %}> <li class="{% if tab.key == stream.key %}is-active{% endif %}"{% if tab.key == stream.key %} aria-current="page"{% endif %}>
@ -14,19 +16,21 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div>
{# feed settings #} {# feed settings #}
<details class="mb-5" {% if settings_saved %}open{% endif %}> <details class="detail-pinned-button" {% if settings_saved %}open{% endif %}>
<summary> <summary class="control">
<span class="has-text-weight-bold"> <span class="button">
{{ _("Feed settings") }} <span class="icon icon-dots-three m-0-mobile" aria-hidden="true"></span>
<span class="is-sr-only-mobile">{{ _("Feed settings") }}</span>
</span> </span>
{% if settings_saved %} {% if settings_saved %}
<span class="tag is-success is-light ml-2">{{ _("Saved!") }}</span> <span class="tag is-success is-light ml-2">{{ _("Saved!") }}</span>
{% endif %} {% endif %}
</summary> </summary>
<form class="level is-align-items-flex-end" method="post" action="/{{ tab.key }}#feed"> <form class="notification level is-align-items-flex-end" method="post" action="/{{ tab.key }}#feed">
{% csrf_token %} {% csrf_token %}
<div class="level-left"> <div class="level-left">
@ -48,7 +52,8 @@
</button> </button>
</div> </div>
</form> </form>
</details> </details>
</div>
{# announcements and system messages #} {# announcements and system messages #}
{% if not activities.number > 1 %} {% if not activities.number > 1 %}

29
complete_bwdev.sh Normal file
View file

@ -0,0 +1,29 @@
#/usr/bin/env bash
# for zsh, run:
# autoload bashcompinit
# bashcompinit
complete -W "up
service_ports_web
initdb
resetdb
makemigrations
migrate
bash
shell
dbshell
restart_celery
pytest
collectstatic
makemessages
compilemessages
update_locales
build
clean
black
populate_streams
populate_suggestions
generate_thumbnails
generate_preview_images
copy_media_to_s3
set_cors_to_s3
runweb" -o bashdefault -o default bw-dev