From 0bc12f3bdf491b04099a2dc95901efd519b2f8b3 Mon Sep 17 00:00:00 2001
From: jc21 <jc@jc21.com>
Date: Wed, 4 Sep 2019 14:51:24 +1000
Subject: [PATCH] Merge from develop v2.0.14 release (#196)

* Selection of the ssl protocols/ciphers is done using the default server block. (#189)
* Fix wrap for tags (#195)
---
 package.json                                         | 2 +-
 rootfs/etc/nginx/conf.d/default.conf                 | 2 +-
 src/frontend/js/app/nginx/certificates/list/item.ejs | 2 +-
 src/frontend/scss/custom.scss                        | 5 +++++
 src/frontend/scss/tabler-extra.scss                  | 5 +++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e4d3e2a3..e35e6b6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "A beautiful interface for creating Nginx endpoints",
   "main": "src/backend/index.js",
   "devDependencies": {
diff --git a/rootfs/etc/nginx/conf.d/default.conf b/rootfs/etc/nginx/conf.d/default.conf
index 2530ec2e..9af28ed2 100644
--- a/rootfs/etc/nginx/conf.d/default.conf
+++ b/rootfs/etc/nginx/conf.d/default.conf
@@ -47,7 +47,7 @@ server {
 
   ssl_certificate /data/nginx/dummycert.pem;
   ssl_certificate_key /data/nginx/dummykey.pem;
-  ssl_ciphers aNULL;
+  include conf.d/include/ssl-ciphers.conf;
 
   return 444;
 }
diff --git a/src/frontend/js/app/nginx/certificates/list/item.ejs b/src/frontend/js/app/nginx/certificates/list/item.ejs
index dd794052..e7ee2165 100644
--- a/src/frontend/js/app/nginx/certificates/list/item.ejs
+++ b/src/frontend/js/app/nginx/certificates/list/item.ejs
@@ -4,7 +4,7 @@
     </div>
 </td>
 <td>
-    <div>
+    <div class="wrap">
         <%
         if (provider === 'letsencrypt') {
             domain_names.map(function(host) {
diff --git a/src/frontend/scss/custom.scss b/src/frontend/scss/custom.scss
index 157d020f..ff997da3 100644
--- a/src/frontend/scss/custom.scss
+++ b/src/frontend/scss/custom.scss
@@ -27,3 +27,8 @@ a:hover {
 .card-options .dropdown-menu a:not(.btn) {
     margin-left: 0;
 }
+
+.wrap {
+    display: flex;
+    flex-wrap: wrap;
+}
diff --git a/src/frontend/scss/tabler-extra.scss b/src/frontend/scss/tabler-extra.scss
index 27567446..cb2dcbb6 100644
--- a/src/frontend/scss/tabler-extra.scss
+++ b/src/frontend/scss/tabler-extra.scss
@@ -3,6 +3,11 @@ $yellow: #f1c40f;
 $blue: #467fcf;
 $pink: #f66d9b;
 
+.tag { 
+    margin-bottom: .5em;
+    margin-right: .5em;
+}
+
 .tag.hover-green:hover, .tag.hover-green:active, .tag.hover-green:focus {
     background-color: #5eba00;
     cursor: pointer;