Skip to content

Commit 833bba8

Browse files
jeff-phillips-18jeff-phillips-18
authored
Merge pull request #608 from patternfly/revert-556-new-header
Revert "chore(API docs): update header of angular-patternfly API Docs site"
2 parents 75edffb + d19d33b commit 833bba8

File tree

5 files changed

+23
-841
lines changed

5 files changed

+23
-841
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
},

‎grunt-ngdocs-index.tmpl‎

Lines changed: 21 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -89,86 +89,30 @@
8989
</script>
9090
</head>
9191

92-
<body class="showcase">
93-
<header>
94-
<nav class="navbar navbar-default navbar-fixed-top">
95-
<div class="container-fluid">
96-
<div class="navbar-header">
97-
<button type="button" class="navbar-toggle" ng-click="isOpen = !isOpen">
98-
<span class="sr-only">Toggle navigation</span>
99-
<span class="icon-bar"></span>
100-
<span class="icon-bar"></span>
101-
<span class="icon-bar"></span>
102-
</button>
103-
<div class="navbar-brand">
104-
<a id="logo" ng-bind-template="<%= title %>" href="#"></a>
105-
</div>
106-
</div>
107-
<div class="navbar-collapse navbar-collapse-pf-site collapse">
108-
<ul id="menu-primary" class="nav navbar-nav navbar-right navbar-iconic navbar-utility">
109-
<li class="active">
110-
<a href="#">Components</a>
111-
</li>
112-
<li>
113-
<a href="https://github.com/patternfly/angular-patternfly">Github</a>
114-
</li>
115-
<li class="applauncher-pf dropdown dropdown-kebab-pf">
116-
<a class="dropdown-toggle nav-item-iconic" data-toggle="dropdown" href="#" aria-expanded="true">
117-
<i class="fa fa-th applauncher-pf-icon" aria-hidden="true">
118-
<span class="sr-only">PatternFly Showcases</span>
119-
</i>
92+
<body>
93+
<header class="header">
94+
<div class="navbar navbar-fixed-top">
95+
<div class="navbar-inner">
96+
<div class="container-fluid navbar-inverse">
97+
<% if (image) { %>
98+
<% if (imageLink) { %>
99+
<a href="<%= imageLink %>">
100+
<% } %>
101+
<img class="pull-left" src="<%= image %>">
102+
<% if (imageLink) { %>
120103
</a>
121-
<ul class="dropdown-menu dropdown-menu-right" role="menu">
122-
<li class="applauncher-pf-item" role="menuitem">
123-
<a class="applauncher-pf-link" href="https://rawgit.com/patternfly/patternfly-ng/master-dist/dist-demo/#/">
124-
<span class="applauncher-pf-link-title">PatternFly NG</span>
125-
</a>
126-
</li>
127-
<li class="applauncher-pf-item" role="menuitem">
128-
<a class="applauncher-pf-link" href="https://patternfly-webcomponents.github.io/components.html">
129-
<span class="applauncher-pf-link-title">PatternFly Web Components</span>
130-
</a>
131-
</li>
132-
<li class="applauncher-pf-item" role="menuitem">
133-
<a class="applauncher-pf-link" href="https://rawgit.com/patternfly/patternfly-react/gh-pages/index.html">
134-
<span class="applauncher-pf-link-title">PatternFly React</span>
135-
</a>
136-
</li>
137-
</ul>
138-
</li>
139-
</ul>
104+
<% } %>
105+
<% } %>
106+
<% if (title) {%>
107+
<% if (imageLink) { %>
108+
<img class="pull-left" src="<%= imageLink %>">
109+
<% } %>
110+
<a <% if (titleLink) { %> href="<%= titleLink %>" <% } %> class="navbar-brand"><%= title %></a>
111+
<% } %>
112+
<%= navContent %>
140113
</div>
141114
</div>
142-
</nav>
143-
<nav class="navbar navbar-sidebar navbar-primary" ng-class="{'open': isOpen}">
144-
<ul>
145-
<li class="primary-menu">
146-
<a href="">Menu</a>
147-
<ul>
148-
<li class="active">
149-
<a href="#">Components</a>
150-
</li>
151-
<li>
152-
<a href="https://github.com/patternfly/angular-patternfly">Github</a>
153-
</li>
154-
<li>
155-
<a class="showcase-collapsed" ng-class="{'collapsed': !isCollapsed}" ng-click="isCollapsed = !isCollapsed">PatternFly Showcases</a>
156-
<ul class="collapse" ng-class="{'in': isCollapsed}">
157-
<li>
158-
<a href="https://rawgit.com/patternfly/patternfly-ng/master-dist/dist-demo/#/">PatternFly NG</a>
159-
</li>
160-
<li>
161-
<a href="https://patternfly-webcomponents.github.io/components.html">PatternFly Web Components</a>
162-
</li>
163-
<li>
164-
<a href="https://rawgit.com/patternfly/patternfly-react/gh-pages/index.html">PatternFly React</a>
165-
</li>
166-
</ul>
167-
</li>
168-
</ul>
169-
</li>
170-
</ul>
171-
</nav>
115+
</div>
172116
</header>
173117

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

‎misc/grid-sidebar.png‎

-17 KB
Binary file not shown.

‎misc/patternfly-logo.svg‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)