aboutsummaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-08-08 18:42:31 +0200
committerGitHub <noreply@github.com>2017-08-08 18:42:31 +0200
commit39d1428ab3ecd71467b0494db82e367fb3eb96ca (patch)
tree51ff573b03ba05454101a6cdeb386a1132210b28 /apps/theming
parent3f8e3fbb6b615b0a08a2bd9a27b76284064c0abb (diff)
parentc91e39a4ca619b07bece2787e5330515a1543ed9 (diff)
downloadnextcloud-server-39d1428ab3ecd71467b0494db82e367fb3eb96ca.tar.gz
nextcloud-server-39d1428ab3ecd71467b0494db82e367fb3eb96ca.zip
Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
[stable12] Fix vertical alignment of loading icon and status message in Theming app
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/css/settings-admin.css27
1 files changed, 8 insertions, 19 deletions
diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
index ef3c9f68b27..3adcbe208d1 100644
--- a/apps/theming/css/settings-admin.css
+++ b/apps/theming/css/settings-admin.css
@@ -47,10 +47,6 @@ form.uploadButton {
visibility: visible;
}
-#theming .icon-loading-small:after {
- margin: -10px 0 0 -10px;
-}
-
#theming label span {
display: inline-block;
min-width: 120px;
@@ -58,14 +54,8 @@ form.uploadButton {
vertical-align: top;
}
-#theming .icon-loading-small {
- display: inline-flex;
- padding: 8px;
- margin: 2px 0px;
-}
-
#theming .icon-upload,
-#theming .icon-loading-small {
+#theming .uploadButton .icon-loading-small {
padding: 8px 20px;
width: 20px;
margin: 2px 0px;
@@ -76,17 +66,16 @@ form.uploadButton {
#theming_settings_status {
height: 26px;
margin: 10px;
-
}
-#theming_settings_loading.icon-loading-small {
- float: left;
- padding: 0;
+
+#theming_settings_loading {
+ display: inline-block;
+ vertical-align: middle;
margin-right: 10px;
}
-div#theming_settings_msg {
- margin: 8px;
- margin-left:20px;
- display: inline-block;
+
+#theming_settings_msg {
+ vertical-align: middle;
}
#theming-preview-logo {