Commit 79e5208c954438be8c88e77aad2374ecf80dfd34
1 parent
85b9097ce4
Exists in
master
fixed some minor bugs
Showing
3 changed files
with
9 additions
and
10 deletions
Show diff stats
app/partials/ContactView/ContactView.html
| ... | ... | @@ -26,8 +26,13 @@ |
| 26 | 26 | <i class="fa fa-caret-down" aria-hidden="true"></i> |
| 27 | 27 | </a> |
| 28 | 28 | </li> |
| 29 | + | |
| 29 | 30 | <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" ng-model="searchText" placeholder="Search In Table" ng-model="search" ng-minlength="minlength"></li> |
| 30 | 31 | <li><button type="button" class="btn btn-default btn-sm" ng-click="displayContactList.filter({}); searchText=null">Clear Search And Filters</button></li> |
| 32 | + | |
| 33 | + <!-- <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table" ng-model="search" ng-keyup="searchString(search)" ng-minlength="minlength"></li> | |
| 34 | + <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li> --> | |
| 35 | + | |
| 31 | 36 | <li style="float: right"> <button type="submit" data-toggle="modal" data-target="#contact-modal-3" class="btn btn-success btn-sm"> <i class="fa fa-plus" aria-hidden="true"></i> Add Contact </button></li> |
| 32 | 37 | </ul> |
| 33 | 38 | <br> | ... | ... |
app/partials/customers/customers.html
| ... | ... | @@ -504,10 +504,4 @@ |
| 504 | 504 | sendEvent = function(sel, step) { |
| 505 | 505 | $(sel).trigger('next.m.' + step); |
| 506 | 506 | } |
| 507 | -</script> | |
| 508 | - | |
| 509 | -<select ng-model="test"> | |
| 510 | - <option value="10" selected>10</option> | |
| 511 | - <option value="50">50</option> | |
| 512 | - <option value="100">100</option> | |
| 513 | -</select> | |
| 514 | 507 | \ No newline at end of file |
| 508 | +</script> | |
| 515 | 509 | \ No newline at end of file | ... | ... |
app/partials/updateFuelManager/updateFuelManager.html
| ... | ... | @@ -55,13 +55,13 @@ |
| 55 | 55 | <input type="text" class="form-control" datepicker ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" ng-model="fuelPricing.futureFuelPricing.nextExpiration" style="height:31px; width: 80px; padding: 6px 6px;"> |
| 56 | 56 | </td> |
| 57 | 57 | <td> |
| 58 | - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2}}</span> | |
| 58 | + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.futureFuelPricing.papMargin | number : 2}}</span> | |
| 59 | 59 | </td> |
| 60 | 60 | </tr> |
| 61 | 61 | </tbody> |
| 62 | 62 | </table> |
| 63 | 63 | <div class="row" style="margin-left: 0px;"> |
| 64 | - <div class="col-md-12" style= "text-align: right;"> | |
| 64 | + <div class="col-md-12" style= "text-align: right; padding-left: 0;"> | |
| 65 | 65 | <div style="float: left;"> |
| 66 | 66 | <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" style= "text-align: center; font-size:12px">Save & Deploy Immediately</button> |
| 67 | 67 | |
| ... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 | <!-- /widget --> |
| 245 | 245 | |
| 246 | 246 | |
| 247 | - | |
| 247 | + | |
| 248 | 248 | <div class="widget stacked"> |
| 249 | 249 | <div class="widget-header"> |
| 250 | 250 | <i class="fa fa-pencil"></i> | ... | ... |