carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [3/3] carbondata-site git commit: Updated Apache logo and CarbonData Feature links
Date Thu, 11 May 2017 10:51:43 GMT
Updated Apache logo and CarbonData Feature links


Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/bc19fe54
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/bc19fe54
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/bc19fe54

Branch: refs/heads/asf-site
Commit: bc19fe541fef987ee865400e33c32ab3acfc15c7
Parents: d46e607
Author: chenliang613 <chenliang613@huawei.com>
Authored: Thu May 11 18:51:25 2017 +0800
Committer: chenliang613 <chenliang613@huawei.com>
Committed: Thu May 11 18:51:25 2017 +0800

----------------------------------------------------------------------
 content/css/style.css               |   3 +--
 content/images/CarbonDataLogo.png   | Bin 10971 -> 9533 bytes
 content/images/apacheopensource.png | Bin 0 -> 20068 bytes
 content/index.html                  |  44 +++++++++++++++++++++++++------
 4 files changed, 37 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/bc19fe54/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
index 65ecaf6..3c47323 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -53,8 +53,7 @@ img{ max-width:100%; height:auto}
 .mobile-view{ display:none}
 header{position: fixed;z-index: 9999; width: 100%; height:46px }
 .fixed-padding{ position: relative; padding-top:46px; }
-/*a.logo { width: 210px; display: inline-block;  margin: 10px 0;}*/
-a.logo { width: 170px; display: inline-block;  margin: 5px 0;}
+a.logo { width: 170px; display: inline-block;  margin: 1px 0;}
 .cd-navbar-wrapper.navbar {margin-bottom:0px;border-bottom: 4px solid #ff943d; border-radius:
0; min-height: 40px;}
 /*.cd_navcontnt { margin-top: 20px;}*/
 .cd_navcontnt{ margin-top:9px}

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/bc19fe54/content/images/CarbonDataLogo.png
----------------------------------------------------------------------
diff --git a/content/images/CarbonDataLogo.png b/content/images/CarbonDataLogo.png
index bc09b23..a8daf3e 100644
Binary files a/content/images/CarbonDataLogo.png and b/content/images/CarbonDataLogo.png differ

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/bc19fe54/content/images/apacheopensource.png
----------------------------------------------------------------------
diff --git a/content/images/apacheopensource.png b/content/images/apacheopensource.png
new file mode 100644
index 0000000..a2a3b24
Binary files /dev/null and b/content/images/apacheopensource.png differ

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/bc19fe54/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 9ac8e7d..942a476 100644
--- a/content/index.html
+++ b/content/index.html
@@ -499,7 +499,7 @@
             </h4>
 
             <div class="col-md-4 col-sm-6">
-                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction"
id="ref_butn" target="_blank">
+                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Unique+Data+Organization"
id="ref_butn" target="_blank">
                     <div class="cd-columnblock">
                         <div class="iconbox">
                             <i class="icon uniquedata"></i>
@@ -513,7 +513,7 @@
             </div>
 
             <div class="col-md-4 col-sm-6">
-                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction"
id="ref_butn" target="_blank">
+                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Multi+Level+Indexing"
id="ref_butn" target="_blank">
                     <div class="cd-columnblock">
                         <div class="iconbox">
                             <i class="icon multilevelindexing"></i>
@@ -526,19 +526,19 @@
             </div>
 
             <div class="col-md-4 col-sm-6">
-                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction"
target="_blank">
+                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Seamless+Integration+with+Big+Data+Eco-System"
target="_blank">
                     <div class="cd-columnblock">
                         <div class="iconbox">
                             <i class="icon deepsparkintegration"></i>
                         </div>
-                        <h4 class="title">Deep Spark Integration</h4>
-                        <p class="title-info">DataFrame & SQL compliance.</p>
+                        <h4 class="title">Seamless Integration with Big Data Eco-System</h4>
+                        <p class="title-info">Deep Spark Integration with DataFrame
& SQL compliance.</p>
                     </div>
                 </a>
             </div>
 
             <div class="col-md-4 col-sm-6">
-                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction"
target="_blank">
+                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Advanced+PushDown+Optimizations"
target="_blank">
                     <div class="cd-columnblock">
                         <div class="iconbox">
                             <i class="icon advancedpushdownoptimization"></i>
@@ -552,7 +552,7 @@
             </div>
 
             <div class="col-md-4 col-sm-6">
-                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction"
target="_blank">
+                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Dictionary+Encoding"
target="_blank">
                     <div class="cd-columnblock">
                         <div class="iconbox">
                             <i class="icon dictionaryencoding"></i>
@@ -566,7 +566,7 @@
 
 
             <div class="col-md-4 col-sm-6">
-                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+Introduction">
+                <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/Update+and+Delete+Support"
target="_blank">
                     <div class="cd-columnblock">
                         <div class="iconbox">
                             <i class="icon updatedeletesupport"></i>
@@ -581,6 +581,34 @@
     </div>
 </section><!-- End Flow carbonData part -->
 <section><!-- Apacheblock part -->
+    <div class="cd-apacheblock">
+        <div class="container-fluid">
+            <div class="col-md-3 col-sm-4">
+                <div class="cd-apachepic">
+                    <img src="images/apacheopensource.png" alt=""/>
+                </div>
+            </div>
+            <div class="col-md-9 col-sm-8">
+                <div class="cd-apachetxtblock">
+                    <h4 class="title">Apache & OpenSource
+                        <span class="title-underline"></span>
+                    </h4>
+                    <p class="title-info">
+                        Apache CarbonData is a top level project at<a
+                            href="http://www.apache.org/" class="linktxt" target="blank">
The Apache
+                        Software Foundation (ASF)</a>. The APACHE SOFTWARE FOUNDATION
+                        provides support for the Apache Community of open-source software
projects,
+                        which provide software products for the public good.
+                    </p>
+                    <p class="title-info"> Apache CarbonData is available under
+                        <a href="http://www.apache.org/licenses/LICENSE-2.0" class="linktxt"
+                           target="blank">Apache License, version 2.0.</a>
+                    </p>
+                </div>
+            </div>
+
+        </div>
+    </div>
 </section><!-- End apacheblock part -->
 
 <footer>


Mime
View raw message