Merge branch 'develop' into 1305_receive_messages

This commit is contained in:
Micah Lee 2021-04-29 16:58:33 -07:00
commit 343e1be3d0
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
21 changed files with 367 additions and 84 deletions

View file

@ -2,7 +2,7 @@
<html>
<head>
<title>OnionShare</title>
<title>{% if title %}{{ title }}{% else %}OnionShare Chat{% endif %}</title>
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
</head>
@ -11,7 +11,7 @@
<header class="clearfix">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
<h1>{% if title %}{{ title }}{% else %}OnionShare Chat{% endif %}</h1>
</header>
<noscript>
<p>

View file

@ -2,7 +2,7 @@
<html>
<head>
<title>OnionShare</title>
<title>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" />
@ -14,7 +14,7 @@
<header class="d-flex">
<div class="logo-container">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
<h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
</div>
</header>
@ -57,4 +57,4 @@
</div>
</body>
</html>
</html>

View file

@ -2,7 +2,7 @@
<html>
<head>
<title>OnionShare</title>
<title>{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
@ -13,7 +13,7 @@
<header class="clearfix">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
<h1>{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}</h1>
</header>
<div class="upload-wrapper">

View file

@ -2,9 +2,9 @@
<html>
<head>
<title>OnionShare</title>
<title>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
<meta name="onionshare-filename" content="{{ filename }}">
@ -16,7 +16,7 @@
<header class="d-flex">
<div class="logo-container">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
<h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
</div>
<div class="information d-flex">
<div>Total size: <strong>{{ filesize_human }}</strong> {% if is_zipped %} (compressed){% endif %}</div>
@ -25,10 +25,11 @@
</header>
{% if breadcrumbs %}
<ul class="breadcrumbs">
{% for breadcrumb in breadcrumbs %}<li><a href="{{ breadcrumb[1] }}">{{ breadcrumb[0] }}</a> <span class="sep">&#8227;</span></li>{% endfor %}<li>{{ breadcrumbs_leaf }}</li>
</ul>
{% endif %}
<ul class="breadcrumbs">
{% for breadcrumb in breadcrumbs %}<li><a href="{{ breadcrumb[1] }}">{{ breadcrumb[0] }}</a> <span
class="sep">&#8227;</span></li>{% endfor %}<li>{{ breadcrumbs_leaf }}</li>
</ul>
{% endif %}
<div class="file-list" id="file-list">
<div class="d-flex">
@ -66,4 +67,4 @@
<script async src="{{ static_url_path }}/js/send.js" charset="utf-8"></script>
</body>
</html>
</html>

View file

@ -4,7 +4,7 @@
<head>
<title>OnionShare is closed</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
</head>
@ -12,7 +12,7 @@
<body>
<header class="clearfix">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
<h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
</header>
<div class="info-wrapper">
@ -24,4 +24,4 @@
</div>
</body>
</html>
</html>