Skip to content

Commit 68d2ae5

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 843f9c3 + cd52b2f commit 68d2ae5

File tree

57 files changed

+91
-973
lines changed

Some content is hidden

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

57 files changed

+91
-973
lines changed

‎Gruntfile.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = function (grunt) {
6767
},
6868
img: {
6969
cwd: 'misc/',
70-
src: ['patternfly-orb.svg', 'patternfly-logo.svg', 'grid-sidebar.png','*.png'],
70+
src: ['patternfly-orb.svg', '*.png'],
7171
dest: 'docs/img',
7272
expand: true
7373
},
@@ -163,7 +163,7 @@ module.exports = function (grunt) {
163163
},
164164
ngdocs: {
165165
options: {
166-
title: 'ANGULAR PATTERNFLY',
166+
title: 'Angular Patternfly Documentation',
167167
dest: 'docs',
168168
image: 'misc/logo-alt.svg',
169169
scripts: [
@@ -195,7 +195,6 @@ module.exports = function (grunt) {
195195
'node_modules/patternfly/dist/css/patternfly.css',
196196
'node_modules/patternfly/dist/css/patternfly-additions.css',
197197
'dist/styles/angular-patternfly.css',
198-
'misc/showcase.css',
199198
'misc/ng-docs.css',
200199
'misc/examples.css']
201200
},

‎dist/docs/index.html‎

Lines changed: 17 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Declarative templates with data-binding, MVC, dependency injection and great
1212
testability story all implemented with pure client-side JavaScript!">
1313
<meta name="fragment" content="!">
14-
<title ng-bind-template="ANGULAR PATTERNFLY: {{partialTitle}}">Docs</title>
14+
<title ng-bind-template="Angular Patternfly Documentation: {{partialTitle}}">Docs</title>
1515
<script type="text/javascript">
1616
// dynamically add base tag as well as css and javascript files.
1717
// we can't add css/js the usual way, because some browsers (FF) eagerly prefetch resources
@@ -47,8 +47,6 @@
4747

4848
addTag('link', {rel: 'stylesheet', href: 'css/angular-patternfly.css', type: 'text/css'}, sync);
4949

50-
addTag('link', {rel: 'stylesheet', href: 'css/showcase.css', type: 'text/css'}, sync);
51-
5250
addTag('link', {rel: 'stylesheet', href: 'css/ng-docs.css', type: 'text/css'}, sync);
5351

5452
addTag('link', {rel: 'stylesheet', href: 'css/examples.css', type: 'text/css'}, sync);
@@ -134,86 +132,24 @@
134132
</script>
135133
</head>
136134

137-
<body class="showcase">
138-
<header>
139-
<nav class="navbar navbar-default navbar-fixed-top">
140-
<div class="container-fluid">
141-
<div class="navbar-header">
142-
<button type="button" class="navbar-toggle" ng-click="isOpen = !isOpen">
143-
<span class="sr-only">Toggle navigation</span>
144-
<span class="icon-bar"></span>
145-
<span class="icon-bar"></span>
146-
<span class="icon-bar"></span>
147-
</button>
148-
<div class="navbar-brand">
149-
<a id="logo" ng-bind-template="ANGULAR PATTERNFLY" href="#"></a>
150-
</div>
151-
</div>
152-
<div class="navbar-collapse navbar-collapse-pf-site collapse">
153-
<ul id="menu-primary" class="nav navbar-nav navbar-right navbar-iconic navbar-utility">
154-
<li class="active">
155-
<a href="#">Components</a>
156-
</li>
157-
<li>
158-
<a href="https://github.com/patternfly/angular-patternfly">Github</a>
159-
</li>
160-
<li class="applauncher-pf dropdown dropdown-kebab-pf">
161-
<a class="dropdown-toggle nav-item-iconic" data-toggle="dropdown" href="#" aria-expanded="true">
162-
<i class="fa fa-th applauncher-pf-icon" aria-hidden="true">
163-
<span class="sr-only">PatternFly Showcases</span>
164-
</i>
165-
</a>
166-
<ul class="dropdown-menu dropdown-menu-right" role="menu">
167-
<li class="applauncher-pf-item" role="menuitem">
168-
<a class="applauncher-pf-link" href="https://rawgit.com/patternfly/patternfly-ng/master-dist/dist-demo/#/">
169-
<span class="applauncher-pf-link-title">PatternFly NG</span>
170-
</a>
171-
</li>
172-
<li class="applauncher-pf-item" role="menuitem">
173-
<a class="applauncher-pf-link" href="https://patternfly-webcomponents.github.io/components.html">
174-
<span class="applauncher-pf-link-title">PatternFly Web Components</span>
175-
</a>
176-
</li>
177-
<li class="applauncher-pf-item" role="menuitem">
178-
<a class="applauncher-pf-link" href="https://rawgit.com/patternfly/patternfly-react/gh-pages/index.html">
179-
<span class="applauncher-pf-link-title">PatternFly React</span>
180-
</a>
181-
</li>
182-
</ul>
183-
</li>
184-
</ul>
135+
<body>
136+
<header class="header">
137+
<div class="navbar navbar-fixed-top">
138+
<div class="navbar-inner">
139+
<div class="container-fluid navbar-inverse">
140+
141+
142+
<img class="pull-left" src="grunt-styles/misc/logo-alt.svg">
143+
144+
145+
146+
147+
<a class="navbar-brand">Angular Patternfly Documentation</a>
148+
149+
185150
</div>
186151
</div>
187-
</nav>
188-
<nav class="navbar navbar-sidebar navbar-primary" ng-class="{'open': isOpen}">
189-
<ul>
190-
<li class="primary-menu">
191-
<a href="">Menu</a>
192-
<ul>
193-
<li class="active">
194-
<a href="#">Components</a>
195-
</li>
196-
<li>
197-
<a href="https://github.com/patternfly/angular-patternfly">Github</a>
198-
</li>
199-
<li>
200-
<a class="showcase-collapsed" ng-class="{'collapsed': !isCollapsed}" ng-click="isCollapsed = !isCollapsed">PatternFly Showcases</a>
201-
<ul class="collapse" ng-class="{'in': isCollapsed}">
202-
<li>
203-
<a href="https://rawgit.com/patternfly/patternfly-ng/master-dist/dist-demo/#/">PatternFly NG</a>
204-
</li>
205-
<li>
206-
<a href="https://patternfly-webcomponents.github.io/components.html">PatternFly Web Components</a>
207-
</li>
208-
<li>
209-
<a href="https://rawgit.com/patternfly/patternfly-react/gh-pages/index.html">PatternFly React</a>
210-
</li>
211-
</ul>
212-
</li>
213-
</ul>
214-
</li>
215-
</ul>
216-
</nav>
152+
</div>
217153
</header>
218154

219155
<div role="main" class="container-fluid">

‎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/75edffb/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/833bba8/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/75edffb/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/833bba8/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/75edffb/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/833bba8/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/75edffb/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/833bba8/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/75edffb/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/833bba8/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/75edffb/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/833bba8/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>

‎dist/docs/partials/api/patternfly.card.component.pfCard - Utilization.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/basic/card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/75edffb/src/card/basic/card.component.js#L86" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Utilization</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/basic/card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/833bba8/src/card/basic/card.component.js#L86" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Utilization</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.charts.component.pfC3Chart.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/charts/c3/c3-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/75edffb/src/charts/c3/c3-chart.component.js#L76" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/833bba8/src/charts/c3/c3-chart.component.js#L76" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

0 commit comments

Comments
 (0)