Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #414 from cardosogabriel/master
Browse files Browse the repository at this point in the history 
Updated CSS, updated html classes to match css update
  • Loading branch information
@mtho11
mtho11 committed Aug 25, 2015
2 parents 4bb22eb + 2b40721 commit b413667
Show file tree
Hide file tree
Showing 4 changed files with 191 additions and 32 deletions.
4 changes: 2 additions & 2 deletions console/src/main/scripts/plugins/metrics/html/modals/alerts-jvm-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</button>
<h4 class="modal-title">JVM Alert Settings</h4>
</div>
<div class="modal-body alert-settings">
<div class="modal-body hk-alert-settings">
<tabset>
<tab heading="Heap Usage">

Expand Down Expand Up @@ -163,7 +163,7 @@ <h4 class="modal-title">JVM Alert Settings</h4>


</div>
<div class="modal-footer alert-settings">
<div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="jas.save()"
ng-disabled="jas.saveProgress || !jas.isSettingChange">
<div ng-show="jas.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
Expand Down
4 changes: 2 additions & 2 deletions console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h4 class="modal-title">Availability Alert Settings</h4>
</div>

<div class="modal-body alert-settings">
<div class="modal-body hk-alert-settings">
<div class="hk-tab-content">
<p>Configure conditions settings for Availability alerts and notifications.</p>

Expand All @@ -22,7 +22,7 @@ <h4 class="modal-title">Availability Alert Settings</h4>
</div>
</div>

<div class="modal-footer alert-settings">
<div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="mas.save()"
ng-disabled="!mas.isSettingChange || mas.saveProgress">
<div ng-show="mas.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
Expand Down
4 changes: 2 additions & 2 deletions console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h4 class="modal-title">Response Time Alert Settings</h4>
</div>

<div class="modal-body alert-settings">
<div class="modal-body hk-alert-settings">
<div class="hk-tab-content">
<p>Configure conditions settings for Response Time alerts and notifications.</p>

Expand Down Expand Up @@ -35,7 +35,7 @@ <h4 class="modal-title">Response Time Alert Settings</h4>
</div>
</div>

<div class="modal-footer alert-settings">
<div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="mas.save()"
ng-disabled="!mas.isSettingChange || mas.saveProgress">
<div ng-show="mas.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
Expand Down
211 changes: 185 additions & 26 deletions console/src/main/scripts/plugins/metrics/less/metrics.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,41 @@ a:hover .fa-spinner {
margin-top: @grid-gutter-width/8;
}

.hk-input-text {
line-height: 1.66666667;
}

.dl-horizontal dt {
margin-bottom: 5px;
}


// buttons

.dropdown.clean {
.btn-default {
background-color: transparent;
background-image: none;
border-color: transparent;
box-shadow: none;
}

.btn-default:hover,
.btn-default:focus,
.btn-default:active,
.btn-default.active,
&.open .dropdown-toggle.btn-default {
background-color: #eeeeee;
border-color: #b7b7b7;
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.1)
}

.fa {
margin-right: 5px;
}
}


// tables

.table > thead > tr > th,
Expand All @@ -177,19 +212,36 @@ a:hover .fa-spinner {
text-decoration: underline;
}

.table-striped > tbody > tr:nth-child(odd) > td {
background-color: white;
.table > tbody > tr.hk-alert-open {
background-color: rgba(204, 0, 0, 0.07);

&.success {
background-color: #dff0d8;
&:nth-child(odd) > td {
background-color: transparent;
}
}

.table-striped > tbody {

background-color: white;

> tr:nth-child(odd) > td {
background-color: white;

&.success {
background-color: #dff0d8;
}

&.danger {
background-color: rgba(204, 0, 0, 0.07);
}

&.danger {
background-color: #f2dede;
&.warning {
background-color: #fcf8e3;
}
}

&.warning {
background-color: #fcf8e3;
> tr.open:nth-child(odd) > td {
background-color: transparent;
}
}

Expand Down Expand Up @@ -297,6 +349,87 @@ a:hover .fa-spinner {
}
}

.hk-table-container {
position: relative;

.hk-actions-table {
position: absolute;
top: 6px;
z-index: 10;
right: 5px;
}
}

.hk-alert-center .hk-table-container {
.dataTables_wrapper {
margin-top: 10px;
}

/*
.dataTables_header {
background-color: white;
border-left: none;
border-right: none;
border-bottom: @list-group-border;
}
*/
}

.hk-table-alerts {

background-color: white;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);

&.hk-alerts-contextual {
border-left: none;
border-right: none;
border: none;
font-size: ceil(@font-size-base + 1);
}

&.table-bordered > thead > tr > th,
&.table-bordered > tbody > tr > th,
&.table-bordered > tfoot > tr > th,
&.table-bordered > thead > tr > td,
&.table-bordered > tbody > tr > td,
&.table-bordered > tfoot > tr > td {
border-left: none;
border-right: none;
}

&.hk-alerts-contextual > tbody > tr {
> td {
border-bottom: none;
border-top: none;
}

&:last-child > td {
border-top: 1px solid @table-border-color;
}
}

&.table > thead > tr > th,
&.table > tbody > tr > td {
padding: @grid-gutter-width/3 @grid-gutter-width/2;
}

.fa-flag {
font-size: 20px;
}

tr.hk-alert-resolved .fa-flag {
color: @gray-light;
}

.hk-alert-open .fa-flag {
color: @brand-danger;
}
}

.dataTables_header {

}


// transitions

Expand Down Expand Up @@ -466,7 +599,7 @@ a:hover .fa-spinner {

.hk-url-heading {
margin-bottom: 1px;
padding: @grid-gutter-width/4 @grid-gutter-width/3;
padding: @grid-gutter-width/4 0;

a {
font-size: ceil(@font-size-base * 1.333333);
Expand Down Expand Up @@ -638,6 +771,18 @@ a:hover .fa-spinner {
}
}

.hk-info-top + .hk-panel-table-list {
margin-top: @grid-gutter-width/4;
}

.panel.hk-alert-details {
padding: 10px;
}

.hk-alert-center-detail .hk-panel-table-list {
padding: @grid-gutter-width/2;
}

.blank-slate-pf {
margin-bottom: 20px;
background-color: #ffffff;
Expand Down Expand Up @@ -666,7 +811,7 @@ a:hover .fa-spinner {
margin-top: -10px;
}

.alert-settings .form-horizontal {
.hk-alert-settings .form-horizontal {
margin-top: @grid-gutter-width/2;
}

Expand Down Expand Up @@ -746,6 +891,11 @@ a:hover .fa-spinner {
width: 100%!important;
}

.hk-alert-settings + .modal-footer {
margin-top: 0;
padding-top: 0;
}


// on off switch

Expand Down Expand Up @@ -1153,7 +1303,6 @@ section {
}

.hk-info-top {

position: relative;

.hk-settings {
Expand All @@ -1165,6 +1314,10 @@ section {
margin-right: -11px;
}

.pull-left:first-child {
margin-right: @grid-gutter-width/2;
}

+ .dataTables_wrapper {
margin-top: 0;
}
Expand Down Expand Up @@ -1230,10 +1383,6 @@ section {
}


// dev styles

// bootstrap select quick&dirty workaround

.hk-alerts {
.input-group-btn {
width: auto;
Expand All @@ -1248,7 +1397,7 @@ section {
}
}

.alert-settings {
.hk-alert-settings {
.input-group-btn {
width: auto;
}
Expand All @@ -1271,7 +1420,7 @@ section {
padding: 1.5em 1.5em 0;
}

.alert-settings .form-horizontal {
.hk-alert-settings .form-horizontal {
margin-top: @grid-gutter-width/2;
}

Expand All @@ -1297,10 +1446,6 @@ section {
padding-right: 0;
}

.hk-input-text {
line-height: 1.66666667;
}

.input-group {
float: left;

Expand All @@ -1319,9 +1464,6 @@ section {
margin-left: @grid-gutter-width/4;
}




.onffswitch-form-group {
margin-bottom: 0;
position: relative;
Expand All @@ -1338,7 +1480,6 @@ section {
width: 62px;
}


.help-block {
margin-top: @grid-gutter-width/8;
}
Expand Down Expand Up @@ -1387,6 +1528,24 @@ section {
}
}

// Modal

#modal-jbdc-drivers .btn-primary + .hk-table-list {
margin-top: @grid-gutter-width/4;
}

// Access portal

.navbar-pf .navbar-utility li.dropdown > .dropdown-toggle .pficon-user {
position: static;
}

@media (min-width: 768px) {
.navbar-pf .navbar-utility li.dropdown:first-child > .dropdown-toggle {
padding-left: 15px;
}
}

/* Toastr Overrides */

#toast-container > div {
Expand Down Expand Up @@ -1461,4 +1620,4 @@ section {
#toast-container > .toast-error:after {
content: "";
color: #cc0000;
}
}

0 comments on commit b413667

Please sign in to comment.