Merge pull request #90 from jeff-phillips-18/toolbar

Add sort and actions to pfDataToolbar directive

Author: dtaylor113

bower.json

@@ -40,6 +40,6 @@
     "angular-route": "1.3.0 - 1.4.*",
     "angular-bootstrap": "0.13.x",
     "lodash": "3.x",
-    "patternfly": "2.2.0"
+    "patternfly": "https://github.com/patternfly/patternfly.git#41b81ba31dba9b451dc5b57b17a37b8d5d37d3af"
   }
 }

dist/angular-patternfly.js

@@ -307,19 +307,16 @@
   color: #999999;
 }
 
-.simple-sort .sort-direction {
-  font-size: 22px;
-  color: #222222;
-  margin-left: 5px;
-  border: none;
-  padding: 2px;
-}
-.simple-sort .sort-direction:hover {
-  color: #0099d3;
+.simple-sort .form-group .btn-link {
+  color: #222;
+  font-size: 16px;
+  line-height: 1;
+  padding: 4px 0;
+  margin-left: 10px;
 }
 
-.simple-sort a {
-  cursor: pointer;
+.simple-sort .form-group .btn-link:hover {
+  color: #0099d3;
 }
 
 .input-group .input-group-btn .dropdown-menu > .selected > a {

dist/angular-patternfly.min.js

@@ -63,7 +63,7 @@ hr {
 }
 
 .tiles-view-container .tiles-view-pf .tile {
-  height: 90px;
+  height: 110px;
   width: 300px;
 }
 
@@ -75,3 +75,7 @@ hr {
   height :25px;
   width  :120px;
 }
+
+.actions-label {
+  margin-top: 5px;
+}

dist/styles/angular-patternfly.css

@@ -1,6 +1,6 @@
 <div class="simple-filter filter-fields">
   <form>
-    <div class="form-group">
+    <div class="form-group toolbar-pf-filter">
       <div class="input-group">
         <div dropdown class="input-group-btn">
           <button dropdown-toggle type="button" class="btn btn-default dropdown-toggle filter-fields" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

dist/styles/angular-patternfly.min.css

@@ -1,22 +1,22 @@
 <div class="simple-sort">
   <form>
     <div class="form-group">
-      <div class="input-group">
-        <div dropdown class="input-group-btn">
-          <button dropdown-toggle type="button" class="btn btn-default dropdown-toggle sort-fields" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            {{config.currentField.title}}
-            <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu">
-            <li ng-repeat="item in config.fields" ng-class="{'selected': item === config.currentField}">
-              <a class="sort-field" role="menuitem" tabindex="-1" ng-click="selectField(item)">
-                {{item.title}}
-              </a>
-            </li>
-          </ul>
-        </div>
-        <a><i class="sort-direction" ng-class="getSortIconClass()" ng-click="changeDirection()"></i></a>
+      <div class="dropdown btn-group">
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          {{config.currentField.title}}
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <li ng-repeat="item in config.fields" ng-class="{'selected': item === config.currentField}">
+            <a class="sort-field" role="menuitem" tabindex="-1" ng-click="selectField(item)">
+              {{item.title}}
+            </a>
+          </li>
+        </ul>
       </div>
+      <button class="btn btn-link" type="button">
+        <span class="sort-direction" ng-class="getSortIconClass()" ng-click="changeDirection()"></span>
+      </button>
     </div>
   </form>
 </div>