Merge pull request #34576 from nextcloud/fix/user-theming-admin-overrride

Add admin user customization kill switch

4 files changed, 40 insertions, 4 deletions

diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
index 1f0a241307b..666d2781ee2 100644
--- a/apps/theming/css/default.css
+++ b/apps/theming/css/default.css
@@ -1,6 +1,5 @@
 :root {
   --color-main-background: #ffffff;
-  --color-main-background-not-plain: #0082c9;
   --color-main-background-rgb: 255,255,255;
   --color-main-background-translucent: rgba(var(--color-main-background-rgb), .97);
   --color-main-background-blur: rgba(var(--color-main-background-rgb), .8);
@@ -52,10 +51,11 @@
   --header-menu-item-height: 44px;
   --header-menu-profile-item-height: 66px;
   --breakpoint-mobile: 1024px;
-  --primary-invert-if-bright: no;
   --background-invert-if-dark: no;
   --background-invert-if-bright: invert(100%);
-  --image-main-background: url('/core/img/app-background.jpg');
+  --image-background: url('/core/img/app-background.jpg');
+  --color-background-plain: #0082c9;
+  --primary-invert-if-bright: no;
   --color-primary: #00639a;
   --color-primary-default: #0082c9;
   --color-primary-text: #ffffff;
diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
index 00d4e2414fa..283d76e4305 100644
--- a/apps/theming/css/settings-admin.css
+++ b/apps/theming/css/settings-admin.css
@@ -26,6 +26,8 @@
 }
 #theming form.uploadButton {
   width: 411px;
+  display: flex;
+  align-items: center;
 }
 #theming form .theme-undo,
 #theming .theme-remove-bg {
@@ -41,6 +43,10 @@
   visibility: visible;
   height: 32px;
   width: 32px;
+  margin-left: auto;
+}
+#theming form .theme-undo:not([style*="display:"]) ~ .theme-remove-bg {
+  margin-left: 0;
 }
 #theming input[type=text]:hover + .theme-undo,
 #theming input[type=text] + .theme-undo:hover,
@@ -55,6 +61,8 @@
 #theming label span {
   display: inline-block;
   min-width: 175px;
+  max-width: 175px;
+  white-space: wrap;
   padding: 8px 0px;
   vertical-align: top;
 }
@@ -120,6 +128,14 @@
 #theming #theming-preview-favicon {
   background-image: var(--image-favicon);
 }
+#theming #user-theming {
+  margin-top: 44px;
+  display: flex;
+}
+#theming #user-theming > div {
+  max-width: 400px;
+  margin-bottom: 44px;
+}
 
 /* transition effects for theming value changes */
 #header {
diff --git a/apps/theming/css/settings-admin.css.map b/apps/theming/css/settings-admin.css.map
index b5e657a4e30..bb1b36671de 100644
--- a/apps/theming/css/settings-admin.css.map
+++ b/apps/theming/css/settings-admin.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["settings-admin.scss"],"names":[],"mappings":"AACI;EACI;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;;AAEJ;AAAA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQI;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;AAAA;EAEI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGP;EAEO;;AAGP;EACO;;;AAIR;AACA;EACI;;AACA;EACI","file":"settings-admin.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["settings-admin.scss"],"names":[],"mappings":"AACI;EACI;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;;AAEJ;AAAA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;AAEJ;EAEI;;AAGJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;AAAA;EAEI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGP;EAEO;;AAGP;EACO;;AAGJ;EACI;EACA;;AACD;EACK;EACA;;;AAKZ;AACA;EACI;;AACA;EACI","file":"settings-admin.css"}
\ No newline at end of file
diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss
index f43d3b8c417..60d9a823a0b 100644
--- a/apps/theming/css/settings-admin.scss
+++ b/apps/theming/css/settings-admin.scss
@@ -31,6 +31,8 @@
     }
     form.uploadButton {
         width: 411px;
+        display: flex;
+        align-items: center;
     }
     form .theme-undo,
     .theme-remove-bg {
@@ -46,7 +48,14 @@
         visibility: visible;
         height: 32px;
         width: 32px;
+        // right align
+        margin-left: auto;
     }
+    form .theme-undo:not([style*="display:"]) ~ .theme-remove-bg {
+        // Only align the undo button if both are shown
+        margin-left: 0;
+    }
+
     input[type='text']:hover + .theme-undo,
     input[type='text'] + .theme-undo:hover,
     input[type='text']:focus + .theme-undo,
@@ -61,6 +70,8 @@
     label span {
         display: inline-block;
         min-width: 175px;
+        max-width: 175px;
+        white-space: wrap;
         padding: 8px 0px;
         vertical-align: top;
     }
@@ -137,6 +148,15 @@
 	#theming-preview-favicon {
         background-image: var(--image-favicon);
     }
+
+    #user-theming {
+        margin-top: 44px;
+        display: flex;
+       & > div {
+            max-width: 400px;
+            margin-bottom: 44px;
+        }
+    }
 }
 
 /* transition effects for theming value changes */