Skip to content

Commit

Permalink
Release v0.5.36
Browse files Browse the repository at this point in the history
  • Loading branch information
SparksD2145 committed Apr 20, 2016
1 parent a5317a6 commit a9239df
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rx-data-table",
"version": "0.5.35",
"version": "0.5.36",
"description": "A full-featured data table directive for angularJS",
"main": "rx-data-table.js",
"author": "Stephen Golub",
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/rx-data-table.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/scripts/rx-data-table.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/styles/rx-data-table.css
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
}
.data-table .pagination-container .cell:nth-child(1) {
text-align: left;
padding-left: 10px;
}
.data-table .pagination-container .cell:nth-child(2) {
text-align: center;
Expand Down
4 changes: 2 additions & 2 deletions dist/styles/rx-data-table.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rx-data-table",
"version": "0.5.35",
"version": "0.5.36",
"devDependencies": {
"grunt-contrib-jade": "~0.5.0",
"grunt-hustler": "0.11.2",
Expand Down
1 change: 1 addition & 0 deletions src/styles/rx-data-table.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

&:nth-child(1) {
text-align: left;
padding-left: 10px;
}

&:nth-child(2) {
Expand Down
3 changes: 1 addition & 2 deletions src/templates/rx-data-table.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{{ updateFieldStatus.message }}
</div>
<div class="data-info-row">
<strong ng-if="!pagerObject.showAll">{{(pagerObject.last == 0) ? '0' : pagerObject.first}} - {{pagerObject.last}} of <span class='total-data-items'>{{pagerObject.total}} {{ itemName && itemName || 'Items' }}</span></strong>
<div class="data-table-config-container" ng-if="enableColumnReordering||enableColumnMultiSort" ng-class="{'dropdown-shown': configurationVisible}">
<button class="btn-link" ng-click="toggleVisibility()">
<i class="fa fa-table data-table-config-icon" title="Configure Data Table"></i>
Expand Down Expand Up @@ -149,7 +148,7 @@
</div>
</div>
<div ng-if="!pagerObject.showAll" class="pagination-container" ng-show="pagerObject.total > 0">
<div class="cell"></div>
<div class="cell"><span ng-if="!pagerObject.showAll">{{(pagerObject.last == 0) ? '0' : pagerObject.first}} - {{pagerObject.last}} of <span class='total-data-items'>{{pagerObject.total}} {{ itemName && itemName || 'Items' }}</span></span></div>
<div class="cell"><rx-data-table-paginate page-tracking="pagerObject"></rx-data-table-paginate></div>
<div class="cell"><rx-data-table-items-per-page></rx-data-table-items-per-page></div>
</div>
Expand Down

0 comments on commit a9239df

Please sign in to comment.