Commit 59646561 authored by David Kempe's avatar David Kempe
Browse files

Merge branch 'master' of gitlab.sol1.net:SOL1/meerkat

parents d8670071 186a30ee
......@@ -5,4 +5,4 @@
/backend/dashboards-data
/frontend/node_modules
/frontend/dist
/config
/config/meerkat.toml
......@@ -3,7 +3,7 @@ version: '3.3'
services:
meerkat:
build: .
container_name: meerkat
image: sol1/meerkat:latest
volumes:
- ./config:/meerkat/config
- ./dashboards:/meerkat/dashboards
......
......@@ -531,8 +531,9 @@ audio::-webkit-media-controls-time-remaining-display {
input[type=checkbox].form-control.mute-sounds {
float: right;
margin-right: 11em;
margin-top: -0.8em;
margin-left: 11em;
margin-top: -3em;
position: fixed;
}
.dashboard.view-only .check {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment