diff --git a/.gitignore b/.gitignore index b21e3adf..f667ec91 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ server/**/lib/ server/**/bin/ server/**/pyvenv.cfg __pycache__/ + +data/ +sql/ diff --git a/client/css/colors.styl b/client/css/colors.styl index cf7e7caf..a37f7bbb 100644 --- a/client/css/colors.styl +++ b/client/css/colors.styl @@ -61,4 +61,4 @@ $safety-sketchy = #F3D75F $safety-unsafe = #F3985F $scrollbar-thumb-color = $main-color $scrollbar-bg-color = $input-enabled-background-color -$transparency-grid-square-color = #F0F0F0 +$transparency-grid-square-color = #00000000 diff --git a/docker-compose.yml b/docker-compose.yml index 38e08b97..efcdb643 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,8 @@ version: '2' services: server: - image: szurubooru/server:latest +# image: szurubooru/server:latest + build: server depends_on: - sql environment: @@ -27,7 +28,8 @@ services: - "./server/config.yaml:/opt/app/config.yaml" client: - image: szurubooru/client:latest +# image: szurubooru/client:latest + build: client depends_on: - server environment: diff --git a/server/szurubooru/func/images.py b/server/szurubooru/func/images.py index e135d182..3cbfeda8 100644 --- a/server/szurubooru/func/images.py +++ b/server/szurubooru/func/images.py @@ -99,7 +99,7 @@ class Image: "-f", "lavfi", "-i", - "color=white:s=%dx%d" % (self.width, self.height), + "color=black:s=%dx%d" % (self.width, self.height), "-i", "{path}", "-f",