diff --git a/hosting/static/hosting/css/dashboard.css b/hosting/static/hosting/css/dashboard.css index 3974d4c5..80855301 100644 --- a/hosting/static/hosting/css/dashboard.css +++ b/hosting/static/hosting/css/dashboard.css @@ -30,7 +30,7 @@ background: #e9ebee; box-shadow: 1px 3px 3px rgba(0,0,0,0.5); padding: 25px; - color: rgba(124, 139, 175, 0.8); + color: rgba(124, 139, 175, 1); font-size: 19px; display: block; margin-bottom: 15px; diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 45aa68ff..806d40c6 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -440,10 +440,11 @@ } .dashboard-title-thin .un-icon { - height: 30px; + height: 34px; margin-right: 5px; - margin-top: -1px; - width: 30px; + margin-top: -2px; + width: 34px; + vertical-align: middle; } .dashboard-subtitle { @@ -528,8 +529,8 @@ font-size: 22px; } .dashboard-title-thin .un-icon { - height: 20px; - width: 18px; + height: 22px; + width: 22px; margin-top: -3px; } .dashboard-subtitle p { diff --git a/hosting/static/hosting/img/24-hours-support.svg b/hosting/static/hosting/img/24-hours-support.svg index 1617197e..473828a2 100644 --- a/hosting/static/hosting/img/24-hours-support.svg +++ b/hosting/static/hosting/img/24-hours-support.svg @@ -1,79 +1,15 @@ -<<<<<<< HEAD -======= - - - - ->>>>>>> master + \ No newline at end of file diff --git a/hosting/static/hosting/img/billing.svg b/hosting/static/hosting/img/billing.svg index 253b0fb4..c382cffa 100644 --- a/hosting/static/hosting/img/billing.svg +++ b/hosting/static/hosting/img/billing.svg @@ -1,17 +1,13 @@ -<<<<<<< HEAD -======= - ->>>>>>> master diff --git a/hosting/static/hosting/img/dashboard_settings.svg b/hosting/static/hosting/img/dashboard_settings.svg index 38130c74..f8d60bf5 100644 --- a/hosting/static/hosting/img/dashboard_settings.svg +++ b/hosting/static/hosting/img/dashboard_settings.svg @@ -4,8 +4,8 @@