tabulation fixes

Author: Szekeres Bálint

public/assets/css/app.css

@@ -102,18 +102,6 @@ main .file .code pre code {
 	overflow-x: visible;
 }
 
-main .file .code pre code span.include {
-	white-space: pre-line;
-}
-
-main .file .code pre code span.include ng-include {
-	white-space: pre;
-}
-
-main .file .code pre code ng-include {
-	display: inline-block;
-}
-
 footer {
 	padding: 2rem 0 0.5rem;
 	text-align: center;

public/assets/js/app.js

@@ -135,8 +135,13 @@
 			link: {
 				pre: function preLink(scope, iElement, iAttrs, controller) {
 					var tabs = parseInt(iAttrs.ngIncludeTabs || 0);
-					controller.template = controller.template.replace(/^(.*)$/mg, '\t'.repeat(tabs) + '$1').replace(/\s*$/, '');
-					console.log(controller);
+
+					var startRegex = new RegExp('\t'.repeat(tabs - 1));
+
+					controller.template = controller.template
+						.replace(/^(.*)$/mg, '\t'.repeat(tabs) + '$1')
+						.replace(startRegex, '')
+						.replace(/\s*$/, '');
 				},
 			},
 		};

public/templates/_php.conf.html

@@ -4,6 +4,6 @@
 # handle .php
 location ~ \.php$ {<span ng-if="data.file_structure === 'separated'">
 	include _php_fastcgi.conf;
-	</span><span class="include" ng-if="data.file_structure === 'unified'">
-	<ng-include ng-include-tabs="{{ data.file_structure === 'unified' ? 3 : 1 }}" src="'templates/_php_fastcgi.conf.html'" onload="refreshHighlighting()"></ng-include></span>
+	</span><span ng-if="data.file_structure === 'unified'">
+<ng-include ng-include-tabs="{{ data.file_structure === 'unified' ? 3 : 1 }}" src="'templates/_php_fastcgi.conf.html'" onload="refreshHighlighting()"></ng-include></span>
 }

public/templates/example.com.conf.html

@@ -20,7 +20,7 @@
 	include _wordpress.conf;</span><span ng-if="data.php !== 'off'">
 	include _php.conf;</span>
 	include _letsencrypt.conf;
-	include _ssl.conf;</span><span class="include" ng-if="data.file_structure === 'unified'">
+	include _ssl.conf;</span><span ng-if="data.file_structure === 'unified'">
 <ng-include ng-include-tabs="2" src="'templates/_general.conf.html'" onload="refreshHighlighting()"></ng-include><span ng-if="data.php !== 'off' && data.wordpress">
 
 <ng-include ng-include-tabs="2" src="'templates/_wordpress.conf.html'" onload="refreshHighlighting()"></ng-include></span><span ng-if="data.php !== 'off'">
@@ -89,7 +89,7 @@
 
 	server_name {{ data.domain }} *.{{ data.domain }};
 <span ng-if="data.file_structure === 'separated'">
-	include _letsencrypt.conf;</span><span class="include" ng-if="data.file_structure === 'unified'">
+	include _letsencrypt.conf;</span><span ng-if="data.file_structure === 'unified'">
 	<ng-include ng-include-tabs="2" src="'templates/_letsencrypt.conf.html'" onload="refreshHighlighting()"></ng-include></span>
 
 	return 301 https://{{ !data.non_www ? 'www.' : '' }}{{ data.domain }}$request_uri;
@@ -108,7 +108,7 @@
 <span ng-if="data.file_structure === 'separated'">
 	include _general.conf;<span ng-if="data.php !== 'off' && data.wordpress">
 	include _wordpress.conf;</span><span ng-if="data.php !== 'off'">
-	include _php.conf;</span></span><span class="include" ng-if="data.file_structure === 'unified'">
+	include _php.conf;</span></span><span ng-if="data.file_structure === 'unified'">
 <ng-include ng-include-tabs="2" src="'templates/_general.conf.html'" onload="refreshHighlighting()"></ng-include><span ng-if="data.php !== 'off' && data.wordpress">
 
 <ng-include ng-include-tabs="2" src="'templates/_wordpress.conf.html'" onload="refreshHighlighting()"></ng-include></span><span ng-if="data.php !== 'off'">