Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-12-15 16:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/a1346054/onionshare into a1346054-develop

Browse source
This commit is contained in:
Micah Lee 2021-12-04 20:34:07 -08:00
commit 16c6a9f89d
21 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cli/onionshare_cli/resources/static/css/style.css
View file

@ -320,15 +320,15 @@ div#uploads .upload .upload-status {
}
div#uploads .upload input.cancel {
color: #d0011b;
color: #d0011b;
border: 0;
background: none;
box-shadow: none;
border-radius: 0px;
cursor: pointer;
font-family: sans-serif;
font-size: 12px;
text-decoration: none;
cursor: pointer;
font-family: sans-serif;
font-size: 12px;
text-decoration: none;
display: inline-block;
float:right;
}
@ -398,4 +398,4 @@ a {
a:visited {
color: #601ca0;
}
}

4
cli/onionshare_cli/resources/static/js/chat.js
View file

@ -11,7 +11,7 @@ $(function () {
// Store current username received from app context
var current_username = $('#username').val();
// On browser connect, emit a socket event to be added to
// On browser connect, emit a socket event to be added to
// room and assigned random username
socket.on('connect', function () {
socket.emit('joined', {});
@ -148,7 +148,7 @@ var getScrollDiffBefore = function () {
var scrollBottomMaybe = function (scrollDiff) {
// Scrolls to bottom if the user is scrolled at bottom
// if the user has scrolled upp, it wont scroll at bottom.
// if the user has scrolled up, it won't scroll at bottom.
// Note: when a user themselves send a message, it will still
// scroll to the bottom even if they had scrolled up before.
if (scrollDiff > 0) {

2
cli/onionshare_cli/resources/templates/403.html
View file

@ -4,7 +4,7 @@
<head>
<title>OnionShare: 403 Forbidden</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>

2
cli/onionshare_cli/resources/templates/404.html
View file

@ -4,7 +4,7 @@
<head>
<title>OnionShare: 404 Not Found</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>

2
cli/onionshare_cli/resources/templates/405.html
View file

@ -4,7 +4,7 @@
<head>
<title>OnionShare: 405 Method Not Allowed</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>

2
cli/onionshare_cli/resources/templates/500.html
View file

@ -4,7 +4,7 @@
<head>
<title>OnionShare: An error occurred</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>