diff --git a/assets/css/app.css b/assets/css/app.css
index 72fb781..995dff6 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -53,39 +53,11 @@
pointer-events: none;
}
-.phx-modal {
- opacity: 1!important;
- position: fixed;
- z-index: 1;
- left: 0;
- top: 0;
+html, body, div[data-phx-main="true"], main.container, .main-view-component {
width: 100%;
height: 100%;
- overflow: auto;
- background-color: rgb(0,0,0);
- background-color: rgba(0,0,0,0.4);
-}
-
-.phx-modal-content {
- background-color: #fefefe;
- margin: 15vh auto;
- padding: 20px;
- border: 1px solid #888;
- width: 80%;
-}
-
-.phx-modal-close {
- color: #aaa;
- float: right;
- font-size: 28px;
- font-weight: bold;
-}
-
-.phx-modal-close:hover,
-.phx-modal-close:focus {
- color: black;
- text-decoration: none;
- cursor: pointer;
+ margin: 0;
+ padding: 0;
}
.gthm-logo {
@@ -101,21 +73,22 @@
.main-view-component {
position: relative;
+
+ padding: 10px;
}
-.pump-overlay-btn {
- opacity: 0;
+.main-view-component svg {
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
- position: absolute;
- width: 60px;
- height: 61px;
- top: 384px;
+ margin: 0 auto;
}
-#pump-dec-btn {
- left: 25px;
+.pump-btn:hover {
+ cursor: pointer;
}
-#pump-inc-btn {
- left: 115px;
+.pump-btn-loading:hover {
+ cursor: progress;
}
diff --git a/assets/css/phoenix.css b/assets/css/phoenix.css
index cb99aa8..8e842ab 100644
--- a/assets/css/phoenix.css
+++ b/assets/css/phoenix.css
@@ -19,8 +19,6 @@ pre{padding: 1em;}
.container{
margin: 0 auto;
- max-width: 80.0rem;
- padding: 0 2.0rem;
position: relative;
width: 100%
}
diff --git a/lib/geo_therminator_web/geo_therminator_web.ex b/lib/geo_therminator_web/geo_therminator_web.ex
index 1d9718a..a090f80 100644
--- a/lib/geo_therminator_web/geo_therminator_web.ex
+++ b/lib/geo_therminator_web/geo_therminator_web.ex
@@ -87,6 +87,8 @@ defmodule GeoTherminatorWeb do
# Import basic rendering functionality (render, render_layout, etc)
import Phoenix.View
+ alias Phoenix.LiveView.JS
+
import GeoTherminatorWeb.ErrorHelpers
import GeoTherminatorWeb.Gettext
alias GeoTherminatorWeb.Router.Helpers, as: Routes
diff --git a/lib/geo_therminator_web/live/components/main_view.html.heex b/lib/geo_therminator_web/live/components/main_view.html.heex
index b319d74..d02b7af 100644
--- a/lib/geo_therminator_web/live/components/main_view.html.heex
+++ b/lib/geo_therminator_web/live/components/main_view.html.heex
@@ -22,10 +22,8 @@
pointer-events="none" />
-
- <%= @outdoor_temp %>°C
-
+ <%= @outdoor_temp %>°C
@@ -47,12 +45,12 @@
stroke-miterlimit="10" pointer-events="none" />
-
- <%= @set_temp %>°C
-
+ <%= @set_temp %>°C
-
- -
-
+ -
-
- +
-
+ +
@@ -100,38 +114,28 @@
stroke-miterlimit="10" pointer-events="none" />
-
- <%= @brine_in %>°C
-
+ <%= @brine_in %>°C
-
- <%= @brine_out %>°C
-
+ <%= @brine_out %>°C
-
- <%= @supply_in %>°C
-
+ <%= @supply_in %>°C
-
- <%= @supply_out %>°C
-
+ <%= @supply_out %>°C
-
- <%= @hot_water_temp %>°C
-
+ <%= @hot_water_temp %>°C
@@ -176,25 +180,5 @@
-
- Viewer does not support full SVG 1.1
-
-
-
-
diff --git a/lib/geo_therminator_web/live/main/pump.html.heex b/lib/geo_therminator_web/live/main/pump.html.heex
index 44f7b26..6a3c995 100644
--- a/lib/geo_therminator_web/live/main/pump.html.heex
+++ b/lib/geo_therminator_web/live/main/pump.html.heex
@@ -1,5 +1,3 @@
-<%= live_redirect("« Go back", to: Routes.live_path(@socket, GeoTherminatorWeb.MainLive.Index)) %>
-
<%= if is_nil(@pid) do %>
Some fail happened.
<% else %>
diff --git a/lib/geo_therminator_web/templates/layout/root.html.heex b/lib/geo_therminator_web/templates/layout/root.html.heex
index b18a692..b8e2cfc 100644
--- a/lib/geo_therminator_web/templates/layout/root.html.heex
+++ b/lib/geo_therminator_web/templates/layout/root.html.heex
@@ -10,21 +10,6 @@
-
-
-
-
- 
-
-
-
<%= @inner_content %>