From cd7d9f3a08d59e0b3c21fc5f8e8d9d89562c1d74 Mon Sep 17 00:00:00 2001 From: dtomlinson Date: Wed, 19 Feb 2020 01:58:39 +0000 Subject: [PATCH] updating gn-20 dashboard --- grandnational-dashboard/Dockerfile | 2 +- grandnational-dashboard/app/templates/index.html | 4 ++-- grandnational-dashboard/dashboard.Dockerfile | 8 -------- .../grandnational_dashboard/templates/index.html | 2 +- grandnational-dashboard/static/css/gn.css | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 grandnational-dashboard/dashboard.Dockerfile diff --git a/grandnational-dashboard/Dockerfile b/grandnational-dashboard/Dockerfile index 72cfe71..63dfb5c 100644 --- a/grandnational-dashboard/Dockerfile +++ b/grandnational-dashboard/Dockerfile @@ -2,7 +2,7 @@ FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7 RUN ["pip", "install", "aiofiles", "jinja2" ] -COPY ./app /app +COPY ./grandnational_dashboard /app COPY ./node_modules /node_modules COPY ./bower_components /bower_components COPY ./static /static diff --git a/grandnational-dashboard/app/templates/index.html b/grandnational-dashboard/app/templates/index.html index ae1c34a..a549ef8 100644 --- a/grandnational-dashboard/app/templates/index.html +++ b/grandnational-dashboard/app/templates/index.html @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + diff --git a/grandnational-dashboard/dashboard.Dockerfile b/grandnational-dashboard/dashboard.Dockerfile deleted file mode 100644 index 72cfe71..0000000 --- a/grandnational-dashboard/dashboard.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7 - -RUN ["pip", "install", "aiofiles", "jinja2" ] - -COPY ./app /app -COPY ./node_modules /node_modules -COPY ./bower_components /bower_components -COPY ./static /static diff --git a/grandnational-dashboard/grandnational_dashboard/templates/index.html b/grandnational-dashboard/grandnational_dashboard/templates/index.html index 32cf095..a549ef8 100644 --- a/grandnational-dashboard/grandnational_dashboard/templates/index.html +++ b/grandnational-dashboard/grandnational_dashboard/templates/index.html @@ -1,4 +1,4 @@ - + diff --git a/grandnational-dashboard/static/css/gn.css b/grandnational-dashboard/static/css/gn.css index ff68612..4c8ab0c 100644 --- a/grandnational-dashboard/static/css/gn.css +++ b/grandnational-dashboard/static/css/gn.css @@ -36,7 +36,7 @@ header .overlay { background-color: #000078; opacity: 0.5; z-index: 1; - border-style: solid; + border-bottom: solid; border-bottom-color: white; }