From 86335c9ebe8c7e101df4302601dfa1250b8578e6 Mon Sep 17 00:00:00 2001 From: Mason Chase Date: Mon, 7 Oct 2019 19:58:18 +0200 Subject: [PATCH 1/5] Made Apache and Nginx configuration textarea's font to fixed-width font, Added Jetbrain's PhpStorm to .gitignore --- .gitignore | 1 + interface/web/themes/default/assets/stylesheets/ispconfig.css | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index d42aee61f4..13e0311c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store /nbproject/private/ .phplint-cache +/.idea/ \ No newline at end of file diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css index 76055e6c7e..9a462a9ec9 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css @@ -822,3 +822,7 @@ span.pbvaluemargin { background: #fdd; text-decoration: none; } + +#apache_directives #nginx_directives #proxy_directives { + font-family: Consolas, Courier; +} \ No newline at end of file -- GitLab From 5580306e22b92009e120ee1636f52da6250feb50 Mon Sep 17 00:00:00 2001 From: Mason Chase Date: Mon, 7 Oct 2019 20:01:48 +0000 Subject: [PATCH 2/5] Added server/lib/mysql_clientdb.conf to .gitignore ; This will enable us to run actual git repository in development server with apache server that does symbolic link from /usr/share/ispconfig to third folder such as /usr/src/ispconfig3 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 13e0311c1f..426340074e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store /nbproject/private/ .phplint-cache -/.idea/ \ No newline at end of file +/.idea/ +/server/lib/mysql_clientdb.conf -- GitLab From 9a829f6a7c50fb1ea9e98cdfec31a58ad6eff268 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 26 May 2020 21:27:44 +0200 Subject: [PATCH 3/5] Apply suggestion to interface/web/themes/default/assets/stylesheets/ispconfig.css --- interface/web/themes/default/assets/stylesheets/ispconfig.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css index 9a462a9ec9..8ec312029d 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css @@ -823,6 +823,6 @@ span.pbvaluemargin { text-decoration: none; } -#apache_directives #nginx_directives #proxy_directives { +#apache_directives, #nginx_directives, #proxy_directives { font-family: Consolas, Courier; } \ No newline at end of file -- GitLab From 9fd30eef1e34ee4f53067f7fc9478c6ede93a4da Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 26 May 2020 21:27:51 +0200 Subject: [PATCH 4/5] Apply suggestion to interface/web/themes/default/assets/stylesheets/ispconfig.css --- interface/web/themes/default/assets/stylesheets/ispconfig.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css index 8ec312029d..6e4ba8d2d7 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css @@ -824,5 +824,5 @@ span.pbvaluemargin { } #apache_directives, #nginx_directives, #proxy_directives { - font-family: Consolas, Courier; + font-family: Consolas, "Courier New", Courier, monospace; } \ No newline at end of file -- GitLab From 74cd196a20375fc9f3f412473fa715fbe099ceb4 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 26 May 2020 21:28:24 +0200 Subject: [PATCH 5/5] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 426340074e..dce58df8e6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /nbproject/private/ .phplint-cache /.idea/ -/server/lib/mysql_clientdb.conf -- GitLab