diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index b078bcf53c..869bd1def8 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -132,7 +132,7 @@ opacity: .5; } -/*.preview-overlay-container { + /*.preview-overlay-container { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; @@ -152,19 +152,19 @@ width: 100%; }*/ -.cardContent .cardFooter { - position: absolute; - bottom: 0; - background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,0.7))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* IE10+ */ - background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */ - left: 0; - right: 0; - color: #fff; -} + .cardContent .cardFooter { + position: absolute; + bottom: 0; + background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,0.7))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* IE10+ */ + background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */ + left: 0; + right: 0; + color: #fff; + } .cardText { text-overflow: ellipsis; @@ -389,20 +389,15 @@ } } - -@media all and (min-width: 1920px) { - - .bannerCard { - width: 25%; - } -} - - @media all and (min-width: 2200px) { .backdropCard { width: 16.666666666666666666666666666667%; } + + .bannerCard { + width: 25%; + } } diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html index f65d2ca2e5..5c348ce7aa 100644 --- a/dashboard-ui/dashboardhosting.html +++ b/dashboard-ui/dashboardhosting.html @@ -4,7 +4,7 @@ ${TitleAdvanced} -
+
@@ -28,21 +28,11 @@
${LabelPublicHttpPortHelp}
-
  • - - -
    ${LabelEnableAutomaticPortMapHelp}
    -
  • ${LabelExternalDDNSHelp}
    • -
  • - - -
    ${LabelEnableHttpsHelp}
    -
  • @@ -61,6 +51,16 @@
    ${LabelCustomCertificatePathHelp}
    • +
  • + + +
    ${LabelEnableHttpsHelp}
    +
    • +
  • + + +
    ${LabelEnableAutomaticPortMapHelp}
    +
      • diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index 0882ff4606..b298285fd3 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -101,6 +101,10 @@ return [Globalize.translate('LabelSeries')]; } + else if (hint.Type == "BoxSet") { + + return [Globalize.translate('LabelCollection')]; + } return [hint.Type]; }