carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [4/4] incubator-carbondata-site git commit: fix ui issues
Date Thu, 27 Apr 2017 06:54:46 GMT
fix ui issues


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

Branch: refs/heads/asf-site
Commit: 24e325ab0a6d43efeb36986c675952919751e1a5
Parents: 8e32716
Author: chenliang613 <chenliang613@huawei.com>
Authored: Thu Apr 27 14:53:57 2017 +0800
Committer: chenliang613 <chenliang613@huawei.com>
Committed: Thu Apr 27 14:53:57 2017 +0800

----------------------------------------------------------------------
 content/css/style.css              |  15 +++++------
 content/images/CDfullyIndexing.png | Bin 16409 -> 130335 bytes
 content/index.html                 |  46 +++++---------------------------
 content/js/custom.js               |  14 ++++++++++
 content/mainpage.html              |   8 +++---
 content/security.html              |   4 +--
 content/videogallery.html          |   4 +--
 7 files changed, 36 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
index 5ad9d29..78193a8 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -1,5 +1,4 @@
 
-@import url("mdstyle.css");
 @import url("../fonts/fonts_styles.css");
 @import url("font-awesome.min.css");
 
@@ -20,12 +19,12 @@ a:hover, a:focus{ color:#ff943d; text-decoration:none}
 
 img{ max-width:100%; height:auto}
 
-table {
+ #viewpage table {
     border-collapse: collapse;
     width: 100%;
 }
 
-th, td {
+#viewpage th, #viewpage td {
     text-align: left;
     padding: 15px;
     border-bottom: 1px solid #ddd;
@@ -34,11 +33,11 @@ th, td {
     border-top: 1px solid #ddd;
 }
 
-th {
+#viewpage th {
     background-color: #f2f2f2;
 }
 
-tr:nth-child(even){background-color: #f2f2f2}
+#viewpage tr:nth-child(even){background-color: #f2f2f2}
 
 .container-fluid{ max-width: 1180px}
 .container-fluid-full{ max-width: 100%}
@@ -173,8 +172,8 @@ left: auto; right: auto;}
     padding: 0px;
     display: block;
     margin:15px auto 15px;
-    height: 220px;
-    background: #f8f8f8;
+    height: 260px;
+    background: #fff;
 }
 
 .cd-aboutblock .cd-indexing-blog  img{ max-width: 100%; height: 100%}
@@ -268,7 +267,7 @@ left: auto; right: auto;}
 .cd-flowblock .title .title-underline{ height: 2px; width:50px; background: #ff943d; margin:10px
auto; padding: 0; display:block;}
 
 
-.cd-columnblock {display: block; margin:5px 0; padding:10px 5px; height: 150px}
+.cd-columnblock {display: block; margin:5px 0; padding:10px 10px; height: 150px}
 .cd-columnblock:hover { box-shadow: 0 2px 4px #bbb; background: #f8f8f8;}
 
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/images/CDfullyIndexing.png
----------------------------------------------------------------------
diff --git a/content/images/CDfullyIndexing.png b/content/images/CDfullyIndexing.png
index 4ce587c..22572d9 100644
Binary files a/content/images/CDfullyIndexing.png and b/content/images/CDfullyIndexing.png
differ

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 5c482b9..b82f27b 100644
--- a/content/index.html
+++ b/content/index.html
@@ -139,7 +139,7 @@
                             <tr>
                                 <td style="width:80%">
                                     <input type="text" name="q" size=" 5" maxlength="255"
value=""
-                                           class="search-input"/>
+                                           class="search-input" placeholder="Search...."
   required/>
                                 </td>
                                 <td style="width:20%">
                                     <input type="submit" value="Search"/></td>
@@ -147,7 +147,7 @@
                             <tr>
                                 <td align="left" style="font-size:75%" colspan="2">
                                     <input type="checkbox" name="sitesearch" value="carbondata.apache.org"
checked/>
-                                    Only search for CarbonData
+                                    <span style=" position: relative; top: -3px;">
Only search for CarbonData</span>
                                 </td>
                             </tr>
                         </table>
@@ -270,7 +270,7 @@
                                     <span class="title-underline"></span>
                                 </h4>
                                 <p class="para-txt">
-                                    Apache CarbonData (incubating) is an indexed columnar
data
+                                    Apache CarbonData is an indexed columnar data
                                     format for fast analytics on big data platform, e.g.
Apache
                                     Hadoop, Apache Spark, etc.
 
@@ -423,7 +423,7 @@
                                             <i class="fa fa-facebook-square" aria-hidden="true"></i></a>
                                         <a href="https://twitter.com/search?q=%23CarbonData"
target="_blank"> <i
                                                 class="fa fa-twitter-square" aria-hidden="true"></i></a>
-                                        <a href="https://www.linkedin.com/groups/10334501">
<i
+                                        <a href="https://www.linkedin.com/groups/10334501"
target="_blank"> <i
                                                 class="fa fa-linkedin-square" aria-hidden="true"></i></a>
                                     </p>
                                 </div>
@@ -581,44 +581,12 @@
     </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/CDincubator.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 an effort undergoing incubation at<a
-                            href="http://www.apache.org/" class="linktxt" target="blank">
The Apache
-                        Software Foundation (ASF)</a> sponsored by the Apache Incubator
PMC.
-                        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 has
-                        yet to be fully endorsed by the ASF.
-                    </p>
-                    <p class="title-info"> Apache CarbonData (incubating) 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>
     <div class="topcontant">
         <div class="container-fluid">
-            <div class="col-md-4 col-sm-4">
+            <div class="col-md-4 col-sm-4">cd-apacheblock
                 <p class="footext">
                     Apache CarbonData, CarbonData, Apache, the Apache feather logo, and the
Apache
                     CarbonData project logo are trademarks of The Apache Software Foundation
@@ -638,10 +606,10 @@
         <div class="container-fluid">
             <div class="col-md-8 col-sm-8">
                 <p class="copyright-txt">Copyright © 2016-2017 Apache CarbonData.
All rights reserved &nbsp;&nbsp;|&nbsp;&nbsp;
-                    <a href="http://www.apache.org/" class="term-links">Apache Software
+                    <a href="http://www.apache.org/" class="term-links" target="_blank">Apache
Software
                         Foundation </a>&nbsp;&nbsp;| &nbsp;&nbsp;
                     <a href="http://www.apache.org/foundation/policies/privacy.html"
-                       class="term-links" target="blank"> Privacy Policy </a>
+                       class="term-links" target="_blank"> Privacy Policy </a>
                 </p>
 
             </div>

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/js/custom.js
----------------------------------------------------------------------
diff --git a/content/js/custom.js b/content/js/custom.js
index 72a873c..e074dd4 100644
--- a/content/js/custom.js
+++ b/content/js/custom.js
@@ -72,3 +72,17 @@ $(document).ready(function(){
       });
   });
 
+//headings scroll in top
+$(document).ready(function() {
+    $('a[href*="#"]:not([href="#"])').click(function () {
+         if (location.pathname.replace(/^\/ /, '') == this.pathname.replace(/^\/ /, '') &&
location.hostname == this.hostname) {
+            var target = $(this.hash);
+            target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
+            if (target.length) {
+                $('html, body').animate({scrollTop: target.offset().top - 56}, 1000);
+                return false;
+            }
+        }
+    });
+});
+

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/mainpage.html
----------------------------------------------------------------------
diff --git a/content/mainpage.html b/content/mainpage.html
index 5c0b627..1b07c03 100644
--- a/content/mainpage.html
+++ b/content/mainpage.html
@@ -67,7 +67,7 @@
                                    target="_blank">Release Archive</a></li>
                         </ul>
                     </li>
-                    <li><a href="mainpage.html" class="">Documentation</a></li>
+                    <li><a href="mainpage.html" class="active">Documentation</a></li>
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true"
                            aria-expanded="false">Community <span class="caret"></span></a>
@@ -125,7 +125,7 @@
                             <tr>
                                 <td style="width:80%">
                                     <input type="text" name="q" size=" 5" maxlength="255"
value=""
-                                           class="search-input"/>
+                                           class="search-input" placeholder="Search...."
   required/>
                                 </td>
                                 <td style="width:20%">
                                     <input type="submit" value="Search"/></td>
@@ -133,7 +133,7 @@
                             <tr>
                                 <td align="left" style="font-size:75%" colspan="2">
                                     <input type="checkbox" name="sitesearch" value="carbondata.apache.org"
checked/>
-                                    Only search for CarbonData
+                                    <span style=" position: relative; top: -3px;">
Only search for CarbonData</span>
                                 </td>
                             </tr>
                         </table>
@@ -163,7 +163,7 @@
 
                                 <div class="col-sm-12  col-md-12">
                                     <span class="text-justify">
-                                        Welcome to Apache CarbonData. Apache CarbonData(incubating)
is a new big data file format for faster interactive query using advanced columnar storage,
index, compression and encoding techniques to improve computing efficiency, which helps in
speeding up queries by an order of magnitude faster over PetaBytes of data. This user guide
provides a detailed description about the CarbonData and its features.
+                                        Welcome to Apache CarbonData. Apache CarbonData is
a new big data file format for faster interactive query using advanced columnar storage, index,
compression and encoding techniques to improve computing efficiency, which helps in speeding
up queries by an order of magnitude faster over PetaBytes of data. This user guide provides
a detailed description about the CarbonData and its features.
                                         Let's get started !
                                     </span>
                                     <hr style="margin: 12px 0 8px">

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/security.html
----------------------------------------------------------------------
diff --git a/content/security.html b/content/security.html
index 13eb615..b8509ab 100644
--- a/content/security.html
+++ b/content/security.html
@@ -116,7 +116,7 @@
                             <tr>
                                 <td style="width:80%">
                                     <input type="text" name="q" size=" 5" maxlength="255"
value=""
-                                           class="search-input"/>
+                                           class="search-input" placeholder="Search...."
   required/>
                                 </td>
                                 <td style="width:20%">
                                     <input type="submit" value="Search"/></td>
@@ -124,7 +124,7 @@
                             <tr>
                                 <td align="left" style="font-size:75%" colspan="2">
                                     <input type="checkbox" name="sitesearch" value="carbondata.apache.org"
checked/>
-                                    Only search for CarbonData
+                                    <span style=" position: relative; top: -3px;">
Only search for CarbonData</span>
                                 </td>
                             </tr>
                         </table>

http://git-wip-us.apache.org/repos/asf/incubator-carbondata-site/blob/24e325ab/content/videogallery.html
----------------------------------------------------------------------
diff --git a/content/videogallery.html b/content/videogallery.html
index aa48e55..6d9caa7 100644
--- a/content/videogallery.html
+++ b/content/videogallery.html
@@ -123,7 +123,7 @@
                             <tr>
                                 <td style="width:80%">
                                     <input type="text" name="q" size=" 5" maxlength="255"
value=""
-                                           class="search-input"/>
+                                           class="search-input" placeholder="Search...."
   required/>
                                 </td>
                                 <td style="width:20%">
                                     <input type="submit" value="Search"/></td>
@@ -131,7 +131,7 @@
                             <tr>
                                 <td align="left" style="font-size:75%" colspan="2">
                                     <input type="checkbox" name="sitesearch" value="carbondata.apache.org"
checked/>
-                                    Only search for CarbonData
+                                    <span style=" position: relative; top: -3px;">
Only search for CarbonData</span>
                                 </td>
                             </tr>
                         </table>


Mime
View raw message