amaterasu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ya...@apache.org
Subject [incubator-amaterasu-site] 06/07: merged site
Date Thu, 12 Jul 2018 04:52:01 GMT
This is an automated email from the ASF dual-hosted git repository.

yaniv pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu-site.git

commit 52586fca660c7002c1a333e3015e0295e9ffa721
Merge: 7120a8a bb8659b
Author: Yaniv Rodenski <roadan@gmail.com>
AuthorDate: Thu Jul 12 14:51:02 2018 +1000

    merged site

 .DS_Store                                          | Bin 6148 -> 6148 bytes
 .../_base.scssc                                    | Bin 0 -> 79930 bytes
 .../_mixins.scssc                                  | Bin 0 -> 12677 bytes
 LICENCE                                            | 202 ---------------------
 README.md                                          |  14 --
 css/main.css                                       |   3 +
 feed.xml                                           |   1 -
 index.html                                         |  19 ++
 8 files changed, 22 insertions(+), 217 deletions(-)

diff --cc css/main.css
index fe29bfb,20fe95a..afe4b77
--- a/css/main.css
+++ b/css/main.css
@@@ -337,9 -337,3 +337,12 @@@ img::-moz-selection 
  
  body {
    -webkit-tap-highlight-color: #1F181A; }
++<<<<<<< HEAD
 +
 +.mt {
 +  margin-top: 2%; }
 +
 +.ml-5 {
 +  margin-left: 5%; }
++=======
++>>>>>>> bb8659b5367296177fc8790dd68d3c04fd493d35
diff --cc feed.xml
index bc07a2f,0868c1d..0000000
deleted file mode 100644,100644
--- a/feed.xml
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- <?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"
><generator uri="https://jekyllrb.com/" version="3.5.2">Jekyll</generator><link
href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link
href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-07-12T14:38:20+10:00</updated><id>http://localhost:4000/</id><subtitle></subtitle></feed>
 -<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"
><generator uri="https://jekyllrb.com/" version="3.5.2">Jekyll</generator><link
href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link
href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2017-10-02T18:50:02+11:00</updated><id>http://localhost:4000/</id><subtitle></subtitle></feed>
diff --cc index.html
index 9fae1ef,3475b6c..4f63b6e
--- a/index.html
+++ b/index.html
@@@ -63,22 -63,19 +63,38 @@@
          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
              <ul class="nav navbar-nav navbar-right">
                  <li>
++<<<<<<< HEAD
 +                    <a class="page-scroll" href="http://amaterasu.incubator.apache.org/#about">About</a>
 +                </li>
 +                <li>
 +                    <a class="page-scroll" href="http://amaterasu.incubator.apache.org/#features">Features</a>
 +                </li>
 +                <li>
 +                    <a class="page-scroll" href="http://amaterasu.incubator.apache.org/downloads.html">Downloads</a>
 +                </li>
 +                <li>
 +                    <a class="page-scroll" href="http://amaterasu.incubator.apache.org/#samples">Samples</a>
 +                </li>
 +                  <li>
 +                    <a class="page-scroll" href="http://amaterasu.incubator.apache.org/#docs">Docs
(coming soon)</a>
 +                </li>
 +                <li>
 +                    <a class="page-scroll" href="http://amaterasu.incubator.apache.org/#contact">Contact</a>
++=======
+                     <a class="page-scroll" href="#about">About</a>
+                 </li>
+                 <li>
+                     <a class="page-scroll" href="#features">Features</a>
+                 </li>
+                 <li>
+                     <a class="page-scroll" href="#samples">Samples</a>
+                 </li>
+                   <li>
+                     <a class="page-scroll" href="#docs">Docs (coming soon)</a>
+                 </li>
+                 <li>
+                     <a class="page-scroll" href="#contact">Contact</a>
++>>>>>>> bb8659b5367296177fc8790dd68d3c04fd493d35
                  </li>
              </ul>
          </div>
@@@ -257,23 -254,6 +273,26 @@@
      </div>
  </section>
  
++<<<<<<< HEAD
 +  <section id="disclaimer">
 +  <hr>
 +  <div class="container">
 +    <img src="img/incubator_feather_egg_logo.png" height="60">
 +    <br>
 +    <br>
 +    <p style="font-size: 12px; line-height: 1.5em;">
 +    Apache Amaterasu is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until
a further review indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects. While incubation
status is not necessarily a reflection of the completeness or stability of the code, it does
indicate that the project [...]
 +    </p>
 +    <p style="font-size: 12px; line-height: 1.5em; margin-top: 2em; margin-bottom: 2em;">
 +            Copyright © 2017 <a href="http://www.apache.org/" target="_blank">The
Apache Software Foundation</a>
 +    <br>
 +    Apache, Apache Amaterasu (incubating), the Apache feather and the Gobblin logo are trademarks
of The Apache Software Foundation
 +    </p>
 +  </div>
 +</section>
 +
++=======
++>>>>>>> bb8659b5367296177fc8790dd68d3c04fd493d35
    <!-- jQuery -->
  <script src="js/jquery.js"></script>
  


Mime
View raw message