aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2017-08-04 15:12:09 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2017-08-07 15:04:43 +0200
commit2398e845c9eac0284e36b67d38704083de0b9d83 (patch)
tree74a06059547811ee2b34c8708c7a49be5572d116
parentde94eefe9799217c8315f1bf93d913d5b4590fbd (diff)
downloadnextcloud-server-2398e845c9eac0284e36b67d38704083de0b9d83.tar.gz
nextcloud-server-2398e845c9eac0284e36b67d38704083de0b9d83.zip
Fix loading icon inside upload button in Theming app
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 <danxuliu@gmail.com>
-rw-r--r--apps/theming/css/settings-admin.css3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
index d39fe75e599..b32ed189ceb 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;