Merge branch 'soon' into staging

pull/1/head
ansuz 6 years ago
commit 96e25c13db

@ -14,6 +14,8 @@ VOLUME /cryptpad/blobstage
VOLUME /cryptpad/pins VOLUME /cryptpad/pins
VOLUME /cryptpad/tasks VOLUME /cryptpad/tasks
VOLUME /cryptpad/block VOLUME /cryptpad/block
VOLUME /cryptpad/blob
VOLUME /cryptpad/blobstage
# Required packages # Required packages
# jq is a build only dependency, removed in cleanup stage # jq is a build only dependency, removed in cleanup stage

@ -36,7 +36,7 @@
text-align: right; text-align: right;
background-color: @colortheme_logo-1; background-color: @colortheme_logo-1;
color: @colortheme_base; color: @colortheme_base;
z-index: 999; z-index: 9999;
transform-origin: bottom right; transform-origin: bottom right;
animation: appear 0.8s ease-in-out; animation: appear 0.8s ease-in-out;
box-shadow: 0 0 10px 0 @colortheme_logo-1; box-shadow: 0 0 10px 0 @colortheme_logo-1;

Loading…
Cancel
Save