You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@incubator.apache.org by po...@apache.org on 2017/07/06 00:21:04 UTC
[33/51] incubator git commit: Cleaning up footer to be more ASF.
Adding ASF header navigation, incubator specific styles.
Cleaning up footer to be more ASF. Adding ASF header navigation, incubator specific styles.
Project: http://git-wip-us.apache.org/repos/asf/incubator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator/commit/5140f7fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator/tree/5140f7fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator/diff/5140f7fe
Branch: refs/heads/master
Commit: 5140f7fe930f0e84291d6eed9bd5c768051f9a01
Parents: 875bb5f
Author: John D. Ament <jo...@apache.org>
Authored: Sat Jun 17 08:10:45 2017 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Sat Jun 17 08:10:45 2017 -0400
----------------------------------------------------------------------
assets/css/incubator.css | 33 +++++++++++++++++++++++++++++++++
templates/footer.gsp | 8 +++-----
templates/header.gsp | 1 +
templates/menu.gsp | 18 ++++++++++++++----
4 files changed, 51 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator/blob/5140f7fe/assets/css/incubator.css
----------------------------------------------------------------------
diff --git a/assets/css/incubator.css b/assets/css/incubator.css
new file mode 100644
index 0000000..67c7288
--- /dev/null
+++ b/assets/css/incubator.css
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.top-container {
+ padding-top:35px!important;
+}
+
+.vcenter {
+ display: inline-block;
+ vertical-align: middle;
+ float: none;
+}
+.incubator-page-header {
+ padding-bottom: 9px;
+ margin: 5px 0 20px;
+ border-bottom: 1px solid #eeeeee;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator/blob/5140f7fe/templates/footer.gsp
----------------------------------------------------------------------
diff --git a/templates/footer.gsp b/templates/footer.gsp
index 97cd685..05972f8 100644
--- a/templates/footer.gsp
+++ b/templates/footer.gsp
@@ -4,13 +4,11 @@
<div id="footer">
<div class="container">
- <p class="muted credit">© 2014 | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a> | Baked with <a href="http://jbake.org">JBake ${version}</a></p>
+ <p class="muted credit">© 2017 The Apache Software Foundation | Licensed under the Apache License, Version 2.0.<br/>
+ Apache Incubator, Apache, the Apache feather logo, and the Apache Incubator project logo are trademarks of The Apache Software Foundation.</p>
</div>
</div>
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
+
<script src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>js/jquery-1.11.1.min.js"></script>
<script src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>js/bootstrap.min.js"></script>
<script src="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>js/prettify.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator/blob/5140f7fe/templates/header.gsp
----------------------------------------------------------------------
diff --git a/templates/header.gsp b/templates/header.gsp
index d8e4af0..3c745cf 100644
--- a/templates/header.gsp
+++ b/templates/header.gsp
@@ -10,6 +10,7 @@
<meta name="generator" content="JBake">
<!-- Le styles -->
+ <link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>css/incubator.css" rel="stylesheet">
<link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>css/bootstrap.css" rel="stylesheet">
<link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>css/asciidoctor.css" rel="stylesheet">
<link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>css/base.css" rel="stylesheet">
http://git-wip-us.apache.org/repos/asf/incubator/blob/5140f7fe/templates/menu.gsp
----------------------------------------------------------------------
diff --git a/templates/menu.gsp b/templates/menu.gsp
index 5d8ece9..a83bffd 100644
--- a/templates/menu.gsp
+++ b/templates/menu.gsp
@@ -28,15 +28,25 @@
<%}%>
</ul>
</li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="http://www.apache.org/foundation/how-it-works.html">How Apache Works</a></li>
+ <li><a href="http://www.apache.org/dev/">Developer Documentation</a></li>
+ <li><a href="http://www.apache.org/foundation/">Foundation</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ </ul>
+ </li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div class="container">
<div class="row">
- <div class="col-md-12">
- <a href="http://incubator.apache.org/"><img src="/images/incubator_feather_egg_logo.png" height="120" alt="Apache Incubator" border="0"></a>
- </div>
+ <div class="col-md-4 vcenter"><a href="https://www.apache.org/"><img src="http://www.apache.org/img/asf_logo.png" alt="The Apache Software Foundation" border="0" style="margin-top: 2px" width="250"></a></div>
+ <div class="col-md-4 vcenter"><a href="/"><img src="https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" alt="The Apache Software Foundation Incubator" border="0" style="margin-top: 2px" height="100"></a></div>
+ <div class="col-md-4 vcenter"><a href="https://www.apache.org/foundation/contributing.html"><img src="https://www.apache.org/images/SupportApache-small.png" height="75" width="75"></a></div>
</div>
</div>
- <div class="container">
\ No newline at end of file
+ <div class="top-container container">
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org