From 2398e845c9eac0284e36b67d38704083de0b9d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 4 Aug 2017 15:12:09 +0200 Subject: [PATCH] Fix loading icon inside upload button in Theming app MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pull request #5969 fixed the vertical alignment of loading icon and status message in Theming app, but in doing so it broke the loading icon inside the upload button. When an image is being uploaded the upload icon is replaced by a loading icon, so the loading icon and the upload icon have to share their CSS rules, but only in that specific case. Signed-off-by: Daniel Calviño Sánchez --- apps/theming/css/settings-admin.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css index d39fe75e59..b32ed189ce 100644 --- a/apps/theming/css/settings-admin.css +++ b/apps/theming/css/settings-admin.css @@ -56,7 +56,8 @@ form.uploadButton { vertical-align: top; } -#theming .icon-upload { +#theming .icon-upload, +#theming .uploadButton .icon-loading-small { padding: 8px 20px; width: 20px; margin: 2px 0px;