mirror of
https://github.com/schlagmichdoch/PairDrop.git
synced 2025-05-01 03:59:13 -04:00
Squashed commit of the following:
commitc04cdad7db
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Sat Sep 22 08:47:40 2018 +0200 Cleanup commit891859680a
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Sat Sep 22 05:55:09 2018 +0200 Refactor about page commit04415ef28f
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Sat Sep 22 04:44:17 2018 +0200 Cleanup commit52bd7692e9
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 23:19:54 2018 +0200 Notifications Android & Desktop commitf537b96213
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 22:32:39 2018 +0200 Notifications commit476cb0ae65
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 22:31:46 2018 +0200 Notifications commit5a631d3833
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 21:21:44 2018 +0200 Notfication API on android commit600d3551f4
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 21:12:11 2018 +0200 Add will-change commit3ac40fb3d7
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 21:04:48 2018 +0200 Don’t reconnect if already connecting commit9c9ca70d05
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:55:15 2018 +0200 Reconnect on rejoin room commit7194c65c74
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:51:56 2018 +0200 Reconnect on rejoin room commit0ede41f8d5
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:34:49 2018 +0200 Cancel keep alive on join room commit1d9581632f
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:25:54 2018 +0200 Cancel keep alive on join room commite71564a97c
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:15:55 2018 +0200 Cancel keep alive on join room commit0731a21d68
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:09:49 2018 +0200 Cancel keep alive on join room commit61697d3abc
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 20:01:59 2018 +0200 Cancel keep alive on join room commitb0fd89eb96
Merge:4cf2bed
b67afca
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:55:32 2018 +0200 Merge remote-tracking branch 'origin/master' into dev # Conflicts: # server/index.js commit4cf2beda90
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:49:16 2018 +0200 Fix beforeunload on iphone commit728aabd449
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:32:59 2018 +0200 Fix typo in server commit96e37aef40
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:25:01 2018 +0200 Fix typo commit31e5f635d1
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:24:01 2018 +0200 Add connection state handler commite573d57419
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:17:07 2018 +0200 STUN server tests commit6a1de29267
Merge:6317c25
92a5f3b
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:15:31 2018 +0200 Merge branch 'dev' of github.com:RobinLinus/snapdrop into dev # Conflicts: # client/scripts/network.js commit6317c25b10
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:14:25 2018 +0200 Cleanup; fix STUN servers commit92a5f3b782
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 19:14:25 2018 +0200 Cleanup; fix STUN servers commite9eeea48e5
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 18:54:52 2018 +0200 Fix notifications on android commit36ec13d428
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 18:53:31 2018 +0200 Fix uncaught error in server commitabf96c0228
Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri Sep 21 16:36:59 2018 +0200 Test
This commit is contained in:
parent
44bd3edd7b
commit
87a2dec992
5 changed files with 181 additions and 181 deletions
|
@ -6,6 +6,7 @@
|
|||
--peer-width: 120px;
|
||||
}
|
||||
|
||||
|
||||
/* Layout */
|
||||
|
||||
html {
|
||||
|
@ -57,10 +58,22 @@ body {
|
|||
bottom: 0;
|
||||
}
|
||||
|
||||
header {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 56px;
|
||||
align-items: center;
|
||||
padding: 16px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
[hidden] {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
|
||||
/* Typography */
|
||||
|
||||
body {
|
||||
|
@ -112,7 +125,7 @@ body {
|
|||
|
||||
a {
|
||||
text-decoration: none;
|
||||
color: var(--primary-color);
|
||||
color: currentColor;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
@ -153,7 +166,11 @@ a {
|
|||
}
|
||||
}
|
||||
|
||||
/* Main Header */
|
||||
|
||||
body>header a {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
/* Peers List */
|
||||
|
||||
|
@ -164,8 +181,6 @@ x-peers {
|
|||
z-index: 2;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Empty Peers List */
|
||||
|
||||
x-no-peers {
|
||||
|
@ -177,7 +192,8 @@ x-no-peers {
|
|||
animation-fill-mode: backwards;
|
||||
}
|
||||
|
||||
x-no-peers h2 {
|
||||
x-no-peers h2,
|
||||
x-no-peers a {
|
||||
color: var(--primary-color);
|
||||
}
|
||||
|
||||
|
@ -266,6 +282,8 @@ x-peer[drop] x-icon {
|
|||
transform: scale(1.1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Footer */
|
||||
|
||||
footer {
|
||||
|
@ -294,7 +312,6 @@ footer .font-body2 {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* Dialog */
|
||||
|
||||
x-dialog x-background {
|
||||
|
@ -335,7 +352,6 @@ x-dialog .row-reverse>.button {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* Receive Dialog */
|
||||
|
||||
#receiveTextDialog #text {
|
||||
|
@ -351,15 +367,12 @@ x-dialog .row-reverse>.button {
|
|||
|
||||
|
||||
|
||||
|
||||
/* Button */
|
||||
|
||||
.button {
|
||||
padding: 0 16px;
|
||||
box-sizing: border-box;
|
||||
min-height: 36px;
|
||||
border: none;
|
||||
outline: none;
|
||||
min-width: 100px;
|
||||
font-size: 14px;
|
||||
line-height: 24px;
|
||||
|
@ -381,6 +394,8 @@ x-dialog .row-reverse>.button {
|
|||
justify-content: center;
|
||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
|
||||
touch-action: manipulation;
|
||||
border: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.button:before,
|
||||
|
@ -405,16 +420,18 @@ x-dialog .row-reverse>.button {
|
|||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.button:focus:before {
|
||||
.button:focus:before,
|
||||
.icon-button:focus:before {
|
||||
opacity: 0.2;
|
||||
}
|
||||
|
||||
|
||||
|
||||
button::-moz-focus-inner {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Icon Button */
|
||||
|
||||
.icon-button {
|
||||
|
@ -444,74 +461,56 @@ input {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* Info Animation */
|
||||
|
||||
#info {
|
||||
text-align: center;
|
||||
#about {
|
||||
color: white;
|
||||
transition: opacity 300ms;
|
||||
will-change: opacity;
|
||||
z-index: 11;
|
||||
transition-delay: 300ms;
|
||||
overflow: hidden;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
#info:not(:target) {
|
||||
#about .fade-in {
|
||||
transition: opacity 300ms;
|
||||
will-change: opacity;
|
||||
transition-delay: 300ms;
|
||||
z-index: 11;
|
||||
pointer-events: all;
|
||||
}
|
||||
|
||||
#about:not(:target) .fade-in {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
transition-delay: 0;
|
||||
}
|
||||
|
||||
#info .logo {
|
||||
#about .logo {
|
||||
--icon-size: 96px;
|
||||
}
|
||||
|
||||
#info .close {
|
||||
#about x-background {
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
right: 12px;
|
||||
color: white;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.info-background {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.info-background:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
top: -20px;
|
||||
left: -32px;
|
||||
top: calc(32px - 200px);
|
||||
right: calc(32px - 200px);
|
||||
width: 400px;
|
||||
height: 400px;
|
||||
border-radius: 50%;
|
||||
background: var(--primary-color);
|
||||
transform: scale(0);
|
||||
transition: transform 800ms cubic-bezier(0.77, 0, 0.175, 1);
|
||||
will-change: transform;
|
||||
transition: transform 800ms cubic-bezier(0.77, 0, 0.175, 1);
|
||||
z-index: -1;
|
||||
}
|
||||
|
||||
#info:target+a>.info-background:before {
|
||||
transform: scale(100);
|
||||
#about:target x-background {
|
||||
transform: scale(10);
|
||||
}
|
||||
|
||||
a[href="#info"] {
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
right: 12px;
|
||||
color: #333;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
#info .row a {
|
||||
color: currentColor;
|
||||
#about .row a {
|
||||
margin: 8px 8px -16px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* Loading Indicator */
|
||||
|
||||
.progress {
|
||||
|
@ -544,7 +543,6 @@ a[href="#info"] {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* Toast */
|
||||
|
||||
.toast-container {
|
||||
|
@ -559,7 +557,6 @@ x-toast {
|
|||
bottom: 24px;
|
||||
width: 100%;
|
||||
max-width: 344px;
|
||||
border-radius: 8px;
|
||||
background-color: #323232;
|
||||
color: rgba(255, 255, 255, 0.95);
|
||||
align-items: center;
|
||||
|
@ -569,7 +566,7 @@ x-toast {
|
|||
transition: opacity 200ms, transform 300ms ease-out;
|
||||
cursor: default;
|
||||
line-height: 24px;
|
||||
border-radius: 6px;
|
||||
border-radius: 8px;
|
||||
pointer-events: all;
|
||||
}
|
||||
|
||||
|
@ -578,12 +575,6 @@ x-toast:not([show]):not(:hover) {
|
|||
transform: translateY(100px);
|
||||
}
|
||||
|
||||
#notification {
|
||||
position: absolute;
|
||||
right: 56px;
|
||||
top: 12px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
/* Instructions */
|
||||
|
||||
|
@ -603,12 +594,10 @@ x-peers:empty~x-instructions {
|
|||
opacity: 0;
|
||||
}
|
||||
|
||||
|
||||
/* Responsive Styles */
|
||||
|
||||
@media (min-height: 800px) {
|
||||
x-toast {
|
||||
right: 24px;
|
||||
}
|
||||
footer {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
@ -625,6 +614,7 @@ screen and (min-width: 1100px) {
|
|||
x-instructions {
|
||||
top: 24px;
|
||||
}
|
||||
|
||||
footer .logo {
|
||||
--icon-size: 40px;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue