Fixed tests and improved app-navigation-caption

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3 files changed, 7 insertions, 25 deletions

diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 1c47ad58729..691b8c3f498 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -130,11 +130,6 @@ input {
 		width: 100%;
 	}
 }
-#personal-settings {
-	.section {
-		border: 0;
-	}
-}
 
 #personal-settings {
 	display: grid;
@@ -143,8 +138,11 @@ input {
 	grid-template-columns:1fr 2fr 1fr;
 	.section {
 		padding: 10px 10px;
+		border: 0;
+		h2 {
+			margin-bottom: 12px;
+		}
 	}
-
 	.personal-info {
 		margin-right: 10%;
 		margin-bottom: 20px;
@@ -223,7 +221,6 @@ input {
 	> div {
 		h2 {
 			position: relative;
-			margin-bottom: 12px;
 			display: inline-flex;
 			flex-wrap: nowrap;
 			justify-content: flex-start;
@@ -1350,21 +1347,6 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	opacity: .7;
 }
 
-.settings-caption {
-	font-weight: bold;
-	line-height: 44px;
-	padding: 0 44px;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	// !important to overwrite specific hover and focus
-	opacity: .4 !important;
-	box-shadow: none !important;
-
-	&:not(:first-child) {
-		margin-top: 22px;
-	}
-}
-
 
 /* USERS LIST -------------------------------------------------------------- */
 #body-settings {
diff --git a/settings/templates/settings/frame.php b/settings/templates/settings/frame.php
index 57522ca7773..a4f44294ad0 100644
--- a/settings/templates/settings/frame.php
+++ b/settings/templates/settings/frame.php
@@ -30,7 +30,7 @@ script('files', 'jquery.fileupload');
 
 <div id="app-navigation">
 	<ul>
-		<li class="settings-caption"><?php p($l->t('Personal')); ?></li>
+		<li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li>
 		<?php
 		foreach($_['forms']['personal'] as $form) {
 			if (isset($form['anchor'])) {
@@ -57,7 +57,7 @@ script('files', 'jquery.fileupload');
 		<?php
 		if(!empty($_['forms']['admin'])) {
 			?>
-			<li class="settings-caption"><?php p($l->t('Administration')); ?></li>
+			<li class="app-navigation-caption"><?php p($l->t('Administration')); ?></li>
 			<?php
 		}
 		foreach($_['forms']['admin'] as $form) {
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index 087451d3040..f8268e199ee 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -78,7 +78,7 @@ vendor_style('jcrop/css/jquery.Jcrop');
 		<div class="personal-settings-setting-box personal-settings-group-box section">
 			<h2><?php p($l->t('Details')); ?></h2>
 			<div id="groups" class="personal-info icon-user">
-				<p class="icon-groups"><?php p($l->t('You are a member of the following groups:')); ?></p>
+				<p><?php p($l->t('You are a member of the following groups:')); ?></p>
 				<p id="groups-groups">
 					<strong><?php p(implode(', ', $_['groups'])); ?></strong>
 				</p>