Skip to content

Commit 0bc12f3

Browse files
authored
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)
1 parent 31aa9c9 commit 0bc12f3

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nginx-proxy-manager",
3-
"version": "2.0.13",
3+
"version": "2.0.14",
44
"description": "A beautiful interface for creating Nginx endpoints",
55
"main": "src/backend/index.js",
66
"devDependencies": {

rootfs/etc/nginx/conf.d/default.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ server {
4747

4848
ssl_certificate /data/nginx/dummycert.pem;
4949
ssl_certificate_key /data/nginx/dummykey.pem;
50-
ssl_ciphers aNULL;
50+
include conf.d/include/ssl-ciphers.conf;
5151

5252
return 444;
5353
}

src/frontend/js/app/nginx/certificates/list/item.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</div>
55
</td>
66
<td>
7-
<div>
7+
<div class="wrap">
88
<%
99
if (provider === 'letsencrypt') {
1010
domain_names.map(function(host) {

src/frontend/scss/custom.scss

+5
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ a:hover {
2727
.card-options .dropdown-menu a:not(.btn) {
2828
margin-left: 0;
2929
}
30+
31+
.wrap {
32+
display: flex;
33+
flex-wrap: wrap;
34+
}

src/frontend/scss/tabler-extra.scss

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ $yellow: #f1c40f;
33
$blue: #467fcf;
44
$pink: #f66d9b;
55

6+
.tag {
7+
margin-bottom: .5em;
8+
margin-right: .5em;
9+
}
10+
611
.tag.hover-green:hover, .tag.hover-green:active, .tag.hover-green:focus {
712
background-color: #5eba00;
813
cursor: pointer;

0 commit comments

Comments
 (0)