Merge pull request #29 from joelthorner/dev

Dev
joelthorner · Jun 8, 2018 · 2b4556b · 2b4556b
2 parents efb79cf + 1cb284a
commit 2b4556b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -8,7 +8,7 @@
 	<!-- Bootstrap CSS -->
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-	<link rel="stylesheet" href="sweetalert2/dist/sweetalert2.min.css">
+	<link rel="stylesheet" href="css/sweetalert2.min.css">
 	<link rel="stylesheet" href="css/floating-labels.css">
 	<link rel="stylesheet" href="css/main.css">
 
@@ -31,7 +31,7 @@
 </head>
 <body>
 	<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-		<a class="navbar-brand" href="#">Emilio generator&nbsp;&nbsp;<small class="badge badge-pill badge-warning">v1.2.2</small></a>
+		<a class="navbar-brand" href="#">Emilio generator&nbsp;&nbsp;<small class="badge badge-pill badge-warning">v1.2.3</small></a>
 		<form class="form-inline" onsubmit="return false;">
 			<input class="form-control form-control-sm mr-sm-2" type="search" placeholder="Search" aria-label="Search" id="search">
 			<button class="btn btn-sm btn-secondary my-2 my-sm-0" type="submit" id="search-submit">Search</button>

diff --git a/js/app.js b/js/app.js
@@ -345,7 +345,9 @@ APP.frontEnd = {
 
 	scrollOnOpenCollap : function() {
 		$('.header-collapsible').click(function(event) {
-			if ($(this).hasClass('collapsed')) {
+
+			if ($(this).hasClass('collapsed') && !$(this).parents('.block-mail').is('[style*="order"]')) {
+				$('.active .collapse').not($(this).attr('href')).collapse('hide');
 				$(this).parents('.scrollable.mails').animate({
 					scrollTop: 88 * $(this).parents('.block-mail').index()
 				}, 350);