Skip to content

Min width 1440px #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2018
Merged

Min width 1440px #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e80bc4
force min-width to 1440px
sergioc Oct 30, 2018
a276fd4
remove unnecessary !important
sergioc Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 92 additions & 19 deletions src/ServicePulse.Host/app/css/particular.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ a {
border-bottom: 5px solid #00A3C4;
}

.navbar-label {
display: none;
}

.navbar-nav > li > a {
padding-bottom: 15px;
padding-top: 20px;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
}


Expand Down Expand Up @@ -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;
Expand All @@ -1576,33 +1578,40 @@ 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 {
overflow: hidden !important;
}
}

@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%;
}
}

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand All @@ -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 {
Expand All @@ -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;
}
}
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<meta charset="utf-8">
<meta name="description" content="An Operations Manager’s Best Friend">
<meta name="author" content="Particular Software">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=1440, initial-scale=1">

<link rel="shortcut icon" href="img/ServicePulse.ico">

Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/js/views/configuration/configuration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1>Configuration</h1>
<div class="row box box-no-click" ng-class="{'box-info': e.monitor_heartbeat, 'box-danger': !e.monitor_heartbeat}" ng-repeat="e in model.endpoints | orderBy:'name'">
<div class="col-sm-12 no-side-padding">
<div class="row">
<div class="col-xs-3 col-sm-2 col-lg-1">
<div class="col-xs-1">
<div class="onoffswitch">
<input type="checkbox" id="onoffswitch{{$id}}" name="onoffswitch{{$id}}" class="onoffswitch-checkbox" ng-click="update(e.id, !e.monitor_heartbeat)" ng-checked="e.monitor_heartbeat">
<label class="onoffswitch-label" for="onoffswitch{{$id}}">
Expand Down
6 changes: 3 additions & 3 deletions src/ServicePulse.Host/app/js/views/dashboard/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h6>System status</h6>
<div class="row box system-status">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-4">
<div class="col-xs-4">
<a class="summary-item" ng-class="{ 'summary-danger' : failedheartbeats > 0 , 'summary-info' : failedheartbeats === 0 || !failedheartbeats }" href="#/endpoints">
<i class="fa fa-heart fa-3x"></i>
<span ng-show="failedheartbeats > 0" class="badge badge-important">{{failedheartbeats | largeNumber:0}}</span>
Expand All @@ -26,7 +26,7 @@ <h4>
</a>

</div>
<div class="col-sm-4">
<div class="col-xs-4">
<a class="summary-item" ng-class="{ 'summary-danger' : failedmessages > 0 , 'summary-info' : failedmessages === 0 || !failedmessages }" href="#/failed-messages/groups">
<i class="fa fa-envelope fa-3x "></i>
<span ng-show="failedmessages > 0" class="badge badge-important">{{failedmessages | largeNumber:0}}</span>
Expand All @@ -36,7 +36,7 @@ <h4>
</h4>
</a>
</div>
<div class="col-sm-4">
<div class="col-xs-4">
<a class="summary-item" ng-class="{ 'summary-danger' : failedcustomchecks > 0, 'summary-info' : failedcustomchecks === 0 || !failedcustomchecks }" href="#/custom-checks">
<i class="fa fa-check fa-3x "></i>
<span ng-show="failedcustomchecks > 0" class="badge badge-important">{{failedcustomchecks | largeNumber:0}}</span>
Expand Down
4 changes: 2 additions & 2 deletions src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h6>Last 10 events</h6>
<div class="row box box-event-item" ng-repeat="eventLogItem in model | orderBy: '-raised_at' | limitTo: 10">
<div class="col-xs-12" ng-click="viewCategory(eventLogItem)">
<div class="row">
<div class="col-xs-2 col-sm-1">
<div class="col-xs-1">

<span class="fa-stack fa-lg">
<i title="{{eventLogItem.category}}" class="fa fa-stack-2x"
Expand All @@ -29,7 +29,7 @@ <h6>Last 10 events</h6>
}"></i>
</span>
</div>
<div class="col-xs-8 col-sm-9">
<div class="col-xs-9">
<div class="row box-header">
<div class="col-sm-12">
<p class="lead">
Expand Down
4 changes: 2 additions & 2 deletions src/ServicePulse.Host/app/js/views/failed_groups/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ <h6>
</div>

<div class="row">
<div class="col-xs-12 col-sm-6 list-section">
<div class="col-xs-6 list-section">
<h6>Failed message groups</h6>
</div>

<div class="col-sm-6 col-xs-12 toolbar-menus no-side-padding">
<div class="col-xs-6 toolbar-menus no-side-padding">

<div class="msg-group-menu dropdown">
<label class="control-label">Group by:</label>
Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/layout/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<footer class="footer visible-md-block visible-lg-block">
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-sm-12">
Expand Down
10 changes: 0 additions & 10 deletions src/ServicePulse.Host/app/layout/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span ng-show="showAlertBadgeOnCollapsedMenu()" class="badge badge-important "
style="top: 0;
right: 0;
position: absolute;">!</span>
</button>
<a class="navbar-brand" href="#/">
<img alt="Service Pulse" src="img/logo.svg">
</a>
Expand Down
Loading