Skip to content

Commit

Permalink
Removed unnecessary slickgrid and duplicate drift partial + css refactor
Browse files Browse the repository at this point in the history
(transferred from ManageIQ/manageiq@bb28f66)
  • Loading branch information
skateman committed Apr 8, 2016
1 parent dfbedf0 commit be99fb3
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 374 deletions.
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
//= require slickgrid/plugins/slick.autotooltips
//= require slickgrid/plugins/slick.rowselectionmodel
//= require slickgrid/plugins/slick.checkboxselectcolumn
//= require miq_slickgrid
//= require codemirror
//= require codemirror/modes/yaml
//= require spin.js/spin
Expand Down
6 changes: 0 additions & 6 deletions app/assets/javascripts/miq_application.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ function miqOnLoad() {
ManageIQ.mouse.y = e.pageY;
});

// Need to do this here for IE, rather then right after the grid is initialized
if ($('#compare_grid').length) {
$('#compare_grid')[0].enableAutoHeight(true);
$('#compare_grid')[0].enableAutoWidth(true);
}

miqBuildCalendar();
miqLoadCharts();

Expand Down
119 changes: 0 additions & 119 deletions app/assets/javascripts/miq_slickgrid.js

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*= require miq_dynatree
*= require codemirror
*= require jqplot
*= require product_slickgrid
*= require kubernetes-topology-graph/topology-graph
*= require jquery-ui-miq-theme/jquery-ui-1.9.2.custom
*= require container_providers_dashboard
Expand Down
80 changes: 41 additions & 39 deletions app/assets/stylesheets/patternfly_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -414,53 +414,55 @@ iframe, .iframe {
left: 0;
right: 0;
bottom: 0;
}
/* compare styling */

#compare-grid {
table.table-expanded, .table-compressed {
table-layout: fixed !important;
word-wrap: break-word !important;
width: auto !important;
max-width: auto !important;
}

table.table-expanded, .table-compressed {
table-layout: fixed !important;
word-wrap: break-word !important;
width: auto !important;
max-width: auto !important;
}

table.table-compressed thead tr th {
height: 150px !important;
width: 26px !important;
text-align: center;
white-space: nowrap;
}
table.table-compressed thead tr th {
height: 150px !important;
width: 26px !important;
text-align: center;
white-space: nowrap;
}

table.table-compressed thead tr th div.rotated-text {
transform:
translate(0px, 110px)
rotate(270deg);
width: 26px;
}
table.table-compressed thead tr th div.rotated-text {
transform:
translate(0px, 110px)
rotate(270deg);
width: 26px;
}

table.table-expanded thead tr th div.quadicon_grid {
padding-left: 40px
}
table.table-expanded thead tr th div.quadicon_grid {
padding-left: 40px
}

table.table-compressed thead th,
table.table-compressed tr td {
width: 26px !important;
text-align: center;
}
table.table-compressed thead th,
table.table-compressed tr td {
width: 26px !important;
text-align: center;
}

table.table-expanded thead th,
table.table-expanded tr td {
width: 175px !important;
min-width: 175px !important;
text-align: center;
}
table.table-expanded thead th,
table.table-expanded tr td {
width: 175px !important;
min-width: 175px !important;
text-align: center;
}

// sets styling of first column
table.table-expanded tbody tr th.treegrid-node,
table.table-compressed tbody th.treegrid-node {
width: 270px !important;
text-align: left;
white-space: nowrap !important;
// sets styling of first column
table.table-expanded tbody tr th.treegrid-node,
table.table-compressed tbody th.treegrid-node {
width: 270px !important;
text-align: left;
white-space: nowrap !important;
}
}

/* Used at Chargeback edit view */
Expand Down
153 changes: 0 additions & 153 deletions app/assets/stylesheets/product_slickgrid.scss

This file was deleted.

Loading

0 comments on commit be99fb3

Please sign in to comment.