From f8ce8f975f7ee301c5587daeaab31dbe7cb98008 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Sat, 12 Aug 2017 00:49:20 +0530 Subject: [PATCH 1/2] footer fix on hosting --- hosting/static/hosting/css/commons.css | 2 +- .../templates/hosting/virtual_machines.html | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 79053e4e..be43ac10 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -7,7 +7,7 @@ } .content-dashboard{ - min-height: calc(100vh - 120px); + min-height: calc(100vh - 70px); width: 80%; margin: 0 auto; max-width: 1120px; diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index cf92f52f..c149be41 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -1,12 +1,12 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 i18n %} -{% block content %} +{% block content %}
- -

{% trans "Virtual Machines"%}

+
+

{% trans "Virtual Machines"%}


{% if messages %} @@ -19,12 +19,12 @@
{% if not error %}

- {% trans "Create VM"%} + {% trans "Create VM"%}


- - - + + + @@ -32,36 +32,36 @@ - + {% for vm in vms %} - + {% if vm.ipv6 %} - - - + + + {% endif %} + {% endfor %} - -
{% trans "ID"%} {% trans "Ipv4"%} {% trans "Ipv6"%}
{{vm.vm_id}}{{vm.vm_id}}{{vm.ipv4}}{{vm.ipv6}}{{vm.ipv4}}{{vm.ipv6}} - + {% if vm.state == 'ACTIVE' %} {{vm.state}} {% elif vm.state == 'FAILED' %} {{vm.state}} {% else %} {{vm.state}} - {% endif %} + {% endif %} -
+ {% endif %} + {% if is_paginated %} {% endif %} - +
From 07f92e754e9821f8765b3ac7d764448c211ebda3 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Sat, 12 Aug 2017 01:18:14 +0530 Subject: [PATCH 2/2] fix for mobile --- hosting/static/hosting/css/landing-page.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index d17ef8f2..0599b108 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -454,16 +454,16 @@ h6 { } footer { - padding: 2%; + padding: 20px; background-color: #f8f8f8; - #position: absolute; +/* position: absolute */ right: 0; bottom: 0; left: 0; } p.copyright { - margin: 15px 0 0; + margin: 14px 0 0; } a#forgotpassword {