From 3d3bf40da43a247ce14328c6d3f26ff6c70983a7 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 28 Mar 2020 15:38:57 +0100
Subject: [PATCH] luci-theme-openwrt-2020: fix a number of  iPad / iOS 13
 quirks

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../htdocs/luci-static/openwrt2020/cascade.css      | 13 ++++++++++---
 .../htdocs/luci-static/openwrt2020/logo.svg         |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css
index eeb487fa6..3217280d4 100644
--- a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css
+++ b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css
@@ -58,7 +58,11 @@ body {
  */
 
 #menubar {
-	background: var(--main-bright-color) url(logo.svg) 10px center/50px 50px no-repeat;
+	background-color: var(--main-bright-color);
+	background-image: url("logo.svg");
+	background-position: 10px center;
+	background-size: 50px 50px;
+	background-repeat: no-repeat;
 	padding: 0 1em 0 70px;
 	min-height: 70px;
 	display: flex;
@@ -1436,14 +1440,16 @@ div[id$=".editlist"] {
 
 .spinning::before {
 	position: absolute;
-	display: flex;
+	display: block;
 	align-items: center;
 	top: 0;
 	bottom: 0;
 	left: .4em;
 	width: 1.3em;
+	height: 1.3em;
 	animation: spin 1s linear infinite;
-	content: url("/luci-static/openwrt2020/spinner.svg");
+	content: url("spinner.svg");
+	margin: auto;
 }
 
 button.spinning, .btn.spinning {
@@ -1454,6 +1460,7 @@ button.spinning::before, .btn.spinning::before {
 	filter: invert(1);
 	left: .2em;
 	width: 1.2em;
+	height: 1.2em;
 }
 
 #view > div.spinning:first-child {
diff --git a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg
index 878a39d40..606022184 100644
--- a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg
+++ b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 81.2 98">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 81 98">
   <path d="m 40.5,50.8 a 6.6,6.6 0 1 0 0,13.2 6.6,6.6 0 0 0 0,-13.2 m -40.5,-33.9 7,6.8 a 47.5,47.5 0 0 1 67.2,0 l 7,-6.8 a 57.2,57.2 0 0 0 -81.2,0" style="fill:#fff" />
   <path d="m 12.5,29.2 6.8,7 a 30,30 0 0 1 42.6,0 l 6.8,-7 a 39.7,39.7 0 0 0 -56.3,0" style="fill:#fff" />
   <path d="m 24.8,41.6 6.8,6.9 a 12.6,12.6 0 0 1 18,0 l 6.8,-6.9 a 22.3,22.3 0 0 0 -31.6,0" style="fill:#fff" />
-- 
2.25.1