Merge pull request #40887 from nextcloud/enh/36965/fix-admin-settings

nextcloud · Oct 13, 2023 · ba12ce8 · ba12ce8
2 parents cdc2f38 + 55c8481
commit ba12ce8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/apps/settings/css/settings.css b/apps/settings/css/settings.css
diff --git a/apps/settings/css/settings.css.map b/apps/settings/css/settings.css.map
diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
@@ -1071,7 +1071,7 @@ span.version {
 }
 
 // Display buttons above each other on mobile
-@media (max-width: math.div(1024px, 2)) {
+@media (max-width: math.div(variables.$breakpoint-mobile, 2)) {
 	.apps-list.installed .section > .actions {
 		display: table-cell;
 	}
@@ -1156,6 +1156,10 @@ table.grid td.date {
 	.nocheckbox {
 		padding-left: 20px;
 	}
+
+	#s2id_linksExcludedGroups {
+		width: 200px !important;
+	}
 }
 
 #shareApiDefaultPermissionsSection label {
@@ -1202,6 +1206,15 @@ table.grid td.date {
 	}
 }
 
+@media (max-width: calc(variables.$breakpoint-mobile * 0.75)) {
+	.mail_settings p label:first-child {
+		width: unset;
+		text-align: left;
+		display: block;
+		margin-top: calc(var(--default-grid-baseline) * 2);
+	}
+}
+
 #mail_smtpport {
 	width: 60px;
 }
@@ -1306,6 +1319,20 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	}
 }
 
+.security-warning__heading {
+	display: flex;
+	flex-wrap: wrap;
+	margin-bottom: calc(var(--default-grid-baseline) * 8);
+
+	> h2 {
+		margin-bottom: 0px;
+	}
+
+	> a {
+		width: 44px;
+	}
+}
+
 #admin-tips li {
 	list-style: initial;
 

diff --git a/apps/settings/templates/settings/admin/overview.php b/apps/settings/templates/settings/admin/overview.php
@@ -28,8 +28,10 @@
 ?>
 
 <div id="security-warning" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Security & setup warnings'));?></h2>
-	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-warnings')); ?>"></a>
+	<div class="security-warning__heading">
+		<h2><?php p($l->t('Security & setup warnings'));?></h2>
+		<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-warnings')); ?>"></a>
+	</div>
 	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the linked documentation for more information.'));?></p>
 
 	<div id="security-warning-state-ok" class="hidden">