fluo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] ctubbsii closed pull request #157: Update site to satisfy Whimsy site check
Date Wed, 11 Apr 2018 19:48:23 GMT
ctubbsii closed pull request #157: Update site to satisfy Whimsy site check
URL: https://github.com/apache/fluo-website/pull/157
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/_layouts/default.html b/_layouts/default.html
index 1cbf262..89c754c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -65,11 +65,12 @@
               <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software
Foundation<span class="caret"></span></a>
               <ul class="dropdown-menu">
                 <li><a href="https://www.apache.org">Apache Homepage</a></li>
-                <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+                <li><a href="https://www.apache.org/licenses/">License</a></li>
                 <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship</i></a></li>
                 <li><a href="https://www.apache.org/security">Security</a></li>
                 <li><a href="https://www.apache.org/foundation/thanks">Thanks</a></li>
                 <li><a href="https://www.apache.org/foundation/policies/conduct">Code
of Conduct</a></li>
+                <li><a href="https://www.apache.org/events/current-event.html">Current
Event</a></li>
               </ul>
             </li>
           </ul>
@@ -82,13 +83,27 @@
             {{ content }}
           </div>
       </div>
-      <hr>
-      <div class="row footer">
-        <div class="col-sm-12 text-center">
-          <div class="center-block">
-          <a href="https://apache.org"><img src="{{ site.baseurl }}/resources/feather.png"
alt="Apache"></a>
-          Copyright &copy; {{ site.time | date: '%Y' }} The Apache Software Foundation.
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache&nbsp;License,&nbsp;Version&nbsp;2.0</a>
-          </div>
+      <div class="row">
+        <div class="col-sm-12 center-block">
+          <footer>
+            <hr/>
+            <p>
+            <a href="https://www.apache.org/foundation/contributing"><img
+              src="https://www.apache.org/images/SupportApache-small.png"
+              id="asf-logo" height="100" alt="Apache"/></a>
+            </p>
+            <p>
+            Copyright &copy; {{ site.time | date: '%Y' }} <a
+              href="https://www.apache.org">The&nbsp;Apache&nbsp;Software&nbsp;Foundation</a>.
+            Licensed under the <a
+              href="https://www.apache.org/licenses/">Apache&nbsp;License,&nbsp;Version&nbsp;2.0</a>
+            </p>
+            <p>
+            ApacheĀ®, the names of Apache projects and their logos, and the multicolor feather
+            logo are registered trademarks or trademarks of The Apache Software Foundation
+            in the United States and/or other countries.
+            </p>
+          </footer>
         </div>
       </div>
     </div>
diff --git a/css/fluo.scss b/css/fluo.scss
index 6e0d93d..691e58d 100644
--- a/css/fluo.scss
+++ b/css/fluo.scss
@@ -13,13 +13,13 @@ th, td {
   border-bottom: 1px solid #ddd;
 }
 
-p { 
+p {
   line-height: 25px;
   padding-top: 5px;
   font-size: 16px;
 }
 
-li { 
+li {
   line-height: 25px;
 }
 
@@ -47,10 +47,28 @@ tr:nth-child(odd) {background: #FFF}
   }
 }
 
-.footer {
-  margin: 10px 0 30px;
-  font-size: 12px;
+footer {
+    margin: 10px 0 30px;
   color: #aaa;
+  padding: 8px 8px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+footer > hr {
+  width: 80%;
+}
+
+footer > p {
+  line-height: 1.5em;
+  padding-top: 1em;
+  font-size: 12px;
+  width: 60%;
+  margin: auto;
+}
+
+#asf-logo {
+  float: left;
 }
 
 // index.html
@@ -79,7 +97,7 @@ tr:nth-child(odd) {background: #FFF}
   margin-bottom: 20px;
 }
 
-// page 
+// page
 #page-content {
   margin-top: 20px;
 }
diff --git a/index.html b/index.html
index b284bbe..f99db1a 100644
--- a/index.html
+++ b/index.html
@@ -33,6 +33,11 @@ <h3 id="news-header">Latest News</h3>
         </div>
       </div>
     </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <a id="asf-current-event-logo" href="https://www.apache.org/events/current-event.html"><img
alt="ASF Current Events" class="img-responsive center-block" src="https://www.apache.org/events/current-event-234x60.png"/></a>
+      </div>
+    </div>
   </div>
 </div>
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message