Skip to content

Commit 2266665

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 87e5cc5 + 1b7a8ba commit 2266665

File tree

59 files changed

+274
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+274
-82
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8704,13 +8704,56 @@ angular.module('patternfly.modals')
87048704
<div class="col-xs-12 pre-demo-text">
87058705
<label>Click the launcher indicator to show the Application Launcher Dropdown:</label>
87068706
</div>
8707-
<nav class="navbar navbar-pf navbar-collapse">
8708-
<ul class="nav navbar-left">
8709-
<li>
8710-
<pf-application-launcher items="navigationItems" label="{{label}}" is-disabled="isDisabled" is-list="isList" hidden-icons="hiddenIcons"></pf-application-launcher>
8711-
</li>
8712-
</ul>
8707+
<nav class="navbar navbar-default navbar-pf" role="navigation">
8708+
<div class="navbar-header">
8709+
<a class="navbar-brand" href="/">
8710+
<img src="img/brand.svg" alt="PatternFly Enterprise Application">
8711+
</a>
8712+
</div>
8713+
<div class="collapse navbar-collapse navbar-collapse-1">
8714+
<ul class="nav navbar-nav navbar-utility">
8715+
<li>
8716+
<pf-application-launcher items="navigationItems" label="{{label}}" is-disabled="isDisabled" is-list="isList" hidden-icons="ctrl.hiddenIcons === 'true'"></pf-application-launcher>
8717+
</li>
8718+
<li class="dropdown">
8719+
<a class="nav-item-iconic" id="horizontalDropdownMenu11" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
8720+
<span title="Help" class="fa pficon-help"></span>
8721+
<span class="caret"></span>
8722+
</a>
8723+
</li>
8724+
<li class="dropdown">
8725+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
8726+
<span class="pficon pficon-user"></span>Brian Johnson <b class="caret"></b>
8727+
</a>
8728+
</li>
8729+
</ul>
8730+
<ul class="nav navbar-nav navbar-primary">
8731+
<li><a href="#">First Link</a></li>
8732+
<li class="active"><a href="#">Another Link</a></li>
8733+
<li><a href="#">And Another</a></li>
8734+
<li><a href="#">As a General Rule</a></li>
8735+
<li><a href="#">Five to Seven Links</a></li>
8736+
<li><a href="#">Is Good</a></li>
8737+
</ul>
8738+
</div>
87138739
</nav>
8740+
<div class="col-md-12">
8741+
<form role="form">
8742+
<div class="row">
8743+
<div class="col-md-3">
8744+
<div class="form-group">
8745+
<label>Grid Menu</label></br>
8746+
<label class="radio-inline">
8747+
<input type="radio" ng-model="ctrl.hiddenIcons" value="false">Icons</input>
8748+
</label>
8749+
<label class="radio-inline">
8750+
<input type="radio" ng-model="ctrl.hiddenIcons" value="true">No Icons</input>
8751+
</label>
8752+
</div>
8753+
</div>
8754+
</div>
8755+
</form>
8756+
</div>
87148757
</div>
87158758
</file>
87168759
<file name="script.js">
@@ -8746,7 +8789,7 @@ angular.module('patternfly.modals')
87468789
$scope.label = 'Application Launcher';
87478790
$scope.isDisabled = false;
87488791
$scope.isList = false;
8749-
$scope.hiddenIcons = false;
8792+
$scope.hiddenIcons = 'false';
87508793
}]);
87518794
</file>
87528795
</example>

‎dist/docs/css/ng-docs.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
margin-right: 0px;
4545
}
4646

47+
a.navbar-brand img {
48+
height: inherit;
49+
width: inherit;
50+
margin-top: inherit;
51+
}
52+
4753
.navbar img+.brand {
4854
padding: 10px 20px 10px 10px;
4955
}

‎dist/docs/grunt-scripts/angular-patternfly.js‎

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8704,13 +8704,56 @@ angular.module('patternfly.modals')
87048704
<div class="col-xs-12 pre-demo-text">
87058705
<label>Click the launcher indicator to show the Application Launcher Dropdown:</label>
87068706
</div>
8707-
<nav class="navbar navbar-pf navbar-collapse">
8708-
<ul class="nav navbar-left">
8709-
<li>
8710-
<pf-application-launcher items="navigationItems" label="{{label}}" is-disabled="isDisabled" is-list="isList" hidden-icons="hiddenIcons"></pf-application-launcher>
8711-
</li>
8712-
</ul>
8707+
<nav class="navbar navbar-default navbar-pf" role="navigation">
8708+
<div class="navbar-header">
8709+
<a class="navbar-brand" href="/">
8710+
<img src="img/brand.svg" alt="PatternFly Enterprise Application">
8711+
</a>
8712+
</div>
8713+
<div class="collapse navbar-collapse navbar-collapse-1">
8714+
<ul class="nav navbar-nav navbar-utility">
8715+
<li>
8716+
<pf-application-launcher items="navigationItems" label="{{label}}" is-disabled="isDisabled" is-list="isList" hidden-icons="ctrl.hiddenIcons === 'true'"></pf-application-launcher>
8717+
</li>
8718+
<li class="dropdown">
8719+
<a class="nav-item-iconic" id="horizontalDropdownMenu11" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
8720+
<span title="Help" class="fa pficon-help"></span>
8721+
<span class="caret"></span>
8722+
</a>
8723+
</li>
8724+
<li class="dropdown">
8725+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
8726+
<span class="pficon pficon-user"></span>Brian Johnson <b class="caret"></b>
8727+
</a>
8728+
</li>
8729+
</ul>
8730+
<ul class="nav navbar-nav navbar-primary">
8731+
<li><a href="#">First Link</a></li>
8732+
<li class="active"><a href="#">Another Link</a></li>
8733+
<li><a href="#">And Another</a></li>
8734+
<li><a href="#">As a General Rule</a></li>
8735+
<li><a href="#">Five to Seven Links</a></li>
8736+
<li><a href="#">Is Good</a></li>
8737+
</ul>
8738+
</div>
87138739
</nav>
8740+
<div class="col-md-12">
8741+
<form role="form">
8742+
<div class="row">
8743+
<div class="col-md-3">
8744+
<div class="form-group">
8745+
<label>Grid Menu</label></br>
8746+
<label class="radio-inline">
8747+
<input type="radio" ng-model="ctrl.hiddenIcons" value="false">Icons</input>
8748+
</label>
8749+
<label class="radio-inline">
8750+
<input type="radio" ng-model="ctrl.hiddenIcons" value="true">No Icons</input>
8751+
</label>
8752+
</div>
8753+
</div>
8754+
</div>
8755+
</form>
8756+
</div>
87148757
</div>
87158758
</file>
87168759
<file name="script.js">
@@ -8746,7 +8789,7 @@ angular.module('patternfly.modals')
87468789
$scope.label = 'Application Launcher';
87478790
$scope.isDisabled = false;
87488791
$scope.isList = false;
8749-
$scope.hiddenIcons = false;
8792+
$scope.hiddenIcons = 'false';
87508793
}]);
87518794
</file>
87528795
</example>

‎dist/docs/js/docs-setup.js‎

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

‎dist/docs/partials/api/patternfly.autofocus.pfFocused.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/2404207/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/73537b6/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.canvas.directive.pfCanvas.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/2404207/src/canvas-view/examples/canvas.js#L329" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/73537b6/src/canvas-view/examples/canvas.js#L329" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.canvas.directive.pfCanvasEditor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/2404207/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/73537b6/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.card.component.pfAggregateStatusCard.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/2404207/src/card/aggregate-status/aggregate-status-card.component.js#L132" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/73537b6/src/card/aggregate-status/aggregate-status-card.component.js#L132" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.card.component.pfCard - Timeframe Filters.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/2404207/src/card/examples/card-timeframe.js#L82" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/73537b6/src/card/examples/card-timeframe.js#L82" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.card.component.pfCard - Trends.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/2404207/src/card/examples/card-trend.js#L159" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/73537b6/src/card/examples/card-trend.js#L159" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

0 commit comments

Comments
 (0)