diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css index 6a7fba1075..7db3451921 100644 --- a/src/ServicePulse.Host/app/css/particular.css +++ b/src/ServicePulse.Host/app/css/particular.css @@ -72,10 +72,6 @@ a { border-bottom: 5px solid #00A3C4; } - .navbar-label { - display: none; - } - .navbar-nav > li > a { padding-bottom: 15px; padding-top: 20px; @@ -1214,7 +1210,7 @@ a.btn-feedback, a.btn-feedback:visited, a.btn-feedback:focus { color: #fff !important; background-color: #00A3C4 !important; padding: 6px 16px !important; - margin: 14px 0 0 14px; + margin: 14px 0 0 0; border-radius: 3px; font-weight: bold; } @@ -1495,6 +1491,10 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { margin: 10px 15px 22px !important; padding-left: 20px !important; } + + .navbar-collapse.collapse.in { + padding: 0 0 0 16px !important; + } } @@ -1563,9 +1563,11 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { margin: 7.5px -15px; } - .navbar-nav > li { - float: none; - } + .navbar-nav > li { + float: none; + float: none; + .navbar-label + } .navbar-nav > li > a { padding-top: 10px; @@ -1576,9 +1578,10 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { float: none; margin: 15px 0; } - /* since 3.1.0 */ + .navbar-collapse.collapse.in { display: block !important; + padding: 0 32px 16px 32px; } .collapsing { @@ -1586,23 +1589,29 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { } } -@media only screen and (min-width: 1200px) { - .container { - width: 92%; - } +.table-head-row .col-xl-7, .endpoint-row .col-xl-7 { + width: 20%; +} + +.table-head-row .col-xl-8, .endpoint-row .col-xl-8 { + width: 36%; } -@media only screen and (min-width: 1440px) { +.table-head-row .col-xl-1, .endpoint-row .col-xl-1 { + width: 16%; +} + +@media only screen and (min-width: 1730px) { .table-head-row .col-xl-7, .endpoint-row .col-xl-7 { - width: 30% !important; + width: 30%; } .table-head-row .col-xl-8, .endpoint-row .col-xl-8 { - width: 44% !important; + width: 44%; } .table-head-row .col-xl-1, .endpoint-row .col-xl-1 { - width: 14% !important; + width: 14%; } } @@ -1899,7 +1908,7 @@ h1 .endpoint-status i.fa-envelope, .endpoint-status i.fa-exclamation-triangle { } .monitoring-head .endpoint-status { - top: 0; + top: 4px; } .monitoring-head .endpoint-status a { @@ -2166,6 +2175,7 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over font-weight: bold; background-color: initial; border-bottom: 3px solid #000; + padding-bottom: 2px; } .nav-pills.period-selector > li > a:hover { @@ -2183,7 +2193,11 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over padding: 10px 6px; } -@media (min-width: 1200px) { +@media (min-width: 0px) { + .container { + width: 92%; + } + .col-lg-max-8 { max-width: 66%; float: left; @@ -2205,6 +2219,7 @@ section[name="message_groups"] .list-section { section[name="configuration"] .alert { margin: 24px 0 0; + min-width: 1440px; } div.alert.alert-warning i.fa.fa-warning { @@ -2225,3 +2240,61 @@ div.alert.alert-warning strong { color: #00729C !important; } +@media (max-width: 1439px) { + html, body, nav { + min-width: 1440px !important; + } + + nav.navbar { + width: 1440px; + position: sticky; + margin-top: -100px; + margin-bottom: 50px; + } + + div.navbar-header { + float: left; + } + + ul.navbar-nav { + margin: 0 8px 0 0; + padding-right: 16px; + display: bloc; + } + + .navbar-nav > li > a { + padding-top: 18px; + padding-bottom: 17px; + } + + .navbar-label { + display: inline !important; + } + + .navbar-collapse.collapse { + display: block !important; + } + + .navbar-nav > li, .navbar-nav { + float: left !important; + height: 59px; + } + + .navbar-nav.navbar-right:last-child { + margin-right: -15px !important; + } + + .navbar-right { + float: right !important; + } + + .navbar-nav > li.active > a { + background: transparent !important; + border-bottom: 5px solid #00A3C4 !important; + } + + .tabs h5 { + margin-bottom: 0; + padding-bottom: 10px; + } +} \ No newline at end of file diff --git a/src/ServicePulse.Host/app/index.html b/src/ServicePulse.Host/app/index.html index 0144cac6b6..668cf75814 100644 --- a/src/ServicePulse.Host/app/index.html +++ b/src/ServicePulse.Host/app/index.html @@ -15,7 +15,7 @@ - + diff --git a/src/ServicePulse.Host/app/js/views/configuration/configuration.html b/src/ServicePulse.Host/app/js/views/configuration/configuration.html index 1a71e14afe..2d70ff89ba 100644 --- a/src/ServicePulse.Host/app/js/views/configuration/configuration.html +++ b/src/ServicePulse.Host/app/js/views/configuration/configuration.html @@ -22,7 +22,7 @@