Login page background fix
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 66f258e..884c5da 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -9,6 +9,7 @@
sudo apt-get -y install httpie
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
cp ../common/xos_common_config ../../xos/xos_configuration/
+ cp ./xos_frontend_config ../../xos/xos_configuration/
cd ../../..; sudo docker build -t xos -f xos/configurations/frontend/Dockerfile .
sudo docker run -v $(XOS_FOLDER)/../../core/xoslib:/opt/xos/core/xoslib -p 9999:8000 --add-host="0.0.0.0:127.0.0.1" xos
bash ../common/wait_for_xos.sh
@@ -17,6 +18,7 @@
interactive:
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
cp ../common/xos_common_config ../../xos/xos_configuration/
+ cp ./xos_frontend_config ../../xos/xos_configuration/
cd ../../..; sudo docker build -t xos -f xos/configurations/frontend/Dockerfile .
echo "Inside the container run: /usr/bin/make -C /opt/xos/configurations/frontend -f Makefile.inside"
sudo docker run -it -v $(shell pwd)/../..:/opt/xos -p 9999:8000 --add-host="0.0.0.0:127.0.0.1" xos
diff --git a/xos/configurations/frontend/xos_frontend_config b/xos/configurations/frontend/xos_frontend_config
new file mode 100644
index 0000000..8dd0ae5
--- /dev/null
+++ b/xos/configurations/frontend/xos_frontend_config
@@ -0,0 +1,4 @@
+[gui]
+branding_name=CORD
+#branding_css=/static/cord.css
+branding_icon=/static/cord_logo_3.png
diff --git a/xos/core/static/xos.css b/xos/core/static/xos.css
index 60140ce..22d2b10 100644
--- a/xos/core/static/xos.css
+++ b/xos/core/static/xos.css
@@ -1,4 +1,4 @@
-************************
+/************************
colors:
tab - active/focus color
background-color: #105E9E !important;
@@ -12,8 +12,8 @@
*************************/
-html, body {
- /*height: 100%;*/
+html, body, body.login {
+ height: 100%;
min-height: 100%;
margin: 0;
}
@@ -1361,4 +1361,4 @@
width: auto;
padding: 10px;
border-radius: 5px;
-}
\ No newline at end of file
+}
diff --git a/xos/templates/admin/base.html b/xos/templates/admin/base.html
index cae98ac..f049da9 100644
--- a/xos/templates/admin/base.html
+++ b/xos/templates/admin/base.html
@@ -64,7 +64,7 @@
{% if not is_popup %}
<div id="sidebar-wrapper">
<a href="{% url 'admin:index' %}" class="hidden-xs">
- <img class="logo" src="{% static 'cord_logo_3.png' %}"/>
+ <img class="logo" src="{% static XOS_BRANDING_ICON %}"/>
</a>
{% include 'suit/menu.html' %}
<button class="navbar-toggle collapsed visible-xs" type="button">
@@ -328,4 +328,4 @@
});
</script>
</body>
-</html>
\ No newline at end of file
+</html>