Skip to content

Commit 7dc7897

Browse files
Add sort and actions to pfDataToolbar directive
Added pfSimpleSort to the data toolbar Added actions to the data toolbar Updated toolbar styling based on latest Toolbar additions to Patternfly Currently using a specific Patternfly commit as a dependency, this will need to be updated when patternfly/patternfly releases next and before we create a patternfly/angular-patternfly release
1 parent 99780f5 commit 7dc7897

File tree

14 files changed

+765
-89
lines changed

14 files changed

+765
-89
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"angular-route": "1.3.0 - 1.4.*",
4141
"angular-bootstrap": "0.13.x",
4242
"lodash": "3.x",
43-
"patternfly": "2.2.0"
43+
"patternfly": "https://github.com/patternfly/patternfly.git#41b81ba31dba9b451dc5b57b17a37b8d5d37d3af"
4444
}
4545
}

dist/angular-patternfly.js

Lines changed: 186 additions & 13 deletions
Large diffs are not rendered by default.

dist/angular-patternfly.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/styles/angular-patternfly.css

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -307,19 +307,16 @@
307307
color: #999999;
308308
}
309309

310-
.simple-sort .sort-direction {
311-
font-size: 22px;
312-
color: #222222;
313-
margin-left: 5px;
314-
border: none;
315-
padding: 2px;
316-
}
317-
.simple-sort .sort-direction:hover {
318-
color: #0099d3;
310+
.simple-sort .form-group .btn-link {
311+
color: #222;
312+
font-size: 16px;
313+
line-height: 1;
314+
padding: 4px 0;
315+
margin-left: 10px;
319316
}
320317

321-
.simple-sort a {
322-
cursor: pointer;
318+
.simple-sort .form-group .btn-link:hover {
319+
color: #0099d3;
323320
}
324321

325322
.input-group .input-group-btn .dropdown-menu > .selected > a {

dist/styles/angular-patternfly.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

misc/demo.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ hr {
6363
}
6464

6565
.tiles-view-container .tiles-view-pf .tile {
66-
height: 90px;
66+
height: 110px;
6767
width: 300px;
6868
}
6969

@@ -75,3 +75,7 @@ hr {
7575
height :25px;
7676
width :120px;
7777
}
78+
79+
.actions-label {
80+
margin-top: 5px;
81+
}

src/filters/simple-filter-fields.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="simple-filter filter-fields">
22
<form>
3-
<div class="form-group">
3+
<div class="form-group toolbar-pf-filter">
44
<div class="input-group">
55
<div dropdown class="input-group-btn">
66
<button dropdown-toggle type="button" class="btn btn-default dropdown-toggle filter-fields" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

src/sort/simple-sort.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<div class="simple-sort">
22
<form>
33
<div class="form-group">
4-
<div class="input-group">
5-
<div dropdown class="input-group-btn">
6-
<button dropdown-toggle type="button" class="btn btn-default dropdown-toggle sort-fields" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
7-
{{config.currentField.title}}
8-
<span class="caret"></span>
9-
</button>
10-
<ul class="dropdown-menu">
11-
<li ng-repeat="item in config.fields" ng-class="{'selected': item === config.currentField}">
12-
<a class="sort-field" role="menuitem" tabindex="-1" ng-click="selectField(item)">
13-
{{item.title}}
14-
</a>
15-
</li>
16-
</ul>
17-
</div>
18-
<a><i class="sort-direction" ng-class="getSortIconClass()" ng-click="changeDirection()"></i></a>
4+
<div class="dropdown btn-group">
5+
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
6+
{{config.currentField.title}}
7+
<span class="caret"></span>
8+
</button>
9+
<ul class="dropdown-menu">
10+
<li ng-repeat="item in config.fields" ng-class="{'selected': item === config.currentField}">
11+
<a class="sort-field" role="menuitem" tabindex="-1" ng-click="selectField(item)">
12+
{{item.title}}
13+
</a>
14+
</li>
15+
</ul>
1916
</div>
17+
<button class="btn btn-link" type="button">
18+
<span class="sort-direction" ng-class="getSortIconClass()" ng-click="changeDirection()"></span>
19+
</button>
2020
</div>
2121
</form>
2222
</div>

0 commit comments

Comments
 (0)