You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ts...@apache.org on 2015/05/01 20:08:17 UTC
[21/50] [abbrv] drill git commit: Moving breadcrumbs into larger
container to have extended border bottom. Got rid of rougue 1px above dl
button in menu. Still exists at 110%,
but this is an improvement. Restored original /docs.html page by adding noChil
Moving breadcrumbs into larger container to have extended border bottom.
Got rid of rougue 1px above dl button in menu. Still exists at 110%, but
this is an improvement. Restored original /docs.html page by adding
noChildren var to top matter, and checking that in order to display
content or not. Adding and adjusting margins where needed, which
restored clipped blog titles. Changing class fa on homepage section, as
that is used by font awesome.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d14f5a8f
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d14f5a8f
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d14f5a8f
Branch: refs/heads/gh-pages
Commit: d14f5a8f79b6c3a4e294c19d8a25a521f4976fbe
Parents: 0906e2a
Author: Danny <dk...@batchblue.com>
Authored: Thu Apr 30 09:07:26 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Thu Apr 30 09:07:26 2015 -0400
----------------------------------------------------------------------
_layouts/docpage.html | 15 ++++++++++-----
css/breadcrumbs.css | 4 +++-
css/docpage.css | 18 +++++++++++++-----
css/responsive.css | 8 ++++----
css/style.css | 18 +++++++++++-------
docs.html | 8 +++++++-
index.html | 2 +-
js/drill.js | 12 ++++++++++++
8 files changed, 61 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/_layouts/docpage.html
----------------------------------------------------------------------
diff --git a/_layouts/docpage.html b/_layouts/docpage.html
index ba7da43..72fb5b5 100644
--- a/_layouts/docpage.html
+++ b/_layouts/docpage.html
@@ -12,20 +12,24 @@ title: Documentation
{% include doctoc.html %}
+
+ {% include breadcrumbs.html %}
<div class="main-content-wrapper">
<div class="main-content">
- {% include breadcrumbs.html %}
+ {% if page.relative_path %}
+ <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/{{ page.relative_path }}" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
+ {% endif %}
<div class="int_title">
<h1>{{ page.title }}</h1>
+
</div>
<link href="{{ site.baseurl }}/css/docpage.css" rel="stylesheet" type="text/css">
<div class="int_text" align="left">
- <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/{{ page.relative_path }}" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
- {% if page_data.children.size == 0 %}
+ {% if page_data.children.size == 0 or page.noChildren %}
{{ content }}
{% else %}
<ul>
@@ -41,8 +45,9 @@ title: Documentation
{% endfor %}
</ul>
{% endif %}
-
- {% include docnav.html %}
+ {% unless page.noChildren %}
+ {% include docnav.html %}
+ {% endunless %}
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/breadcrumbs.css
----------------------------------------------------------------------
diff --git a/css/breadcrumbs.css b/css/breadcrumbs.css
index 0f72e06..e9503c4 100644
--- a/css/breadcrumbs.css
+++ b/css/breadcrumbs.css
@@ -3,8 +3,10 @@
display: block;
padding: 0.5625rem 0 0.5625rem 0;
overflow: hidden;
- margin-top: 55px;
+ margin-top: 56px;
+ margin-left: 0px;
list-style: none;
+ border-bottom: solid 1px #E4E4E4;
width: 100%;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/docpage.css
----------------------------------------------------------------------
diff --git a/css/docpage.css b/css/docpage.css
index 0f074f5..1b120e4 100644
--- a/css/docpage.css
+++ b/css/docpage.css
@@ -24,6 +24,7 @@
div.doc-nav {
overflow: auto;
width: 100%;
+ margin-top: 30px;
}
div.doc-nav a{
text-decoration: none;
@@ -51,7 +52,7 @@ div.doc-nav span.next-toc {
.main-content .int_text {
margin-left: 0px;
- margin-top:30px;
+ margin-top: 0px;
}
.main-content .int_text img {
margin: 30px 0px;
@@ -68,7 +69,8 @@ div.doc-nav span.next-toc {
.main-content .edit-link {
position: relative;
float: right;
- bottom: 105px;
+ margin-top: 13px;
+ margin-right: 20px;
text-decoration: none;
font-size: 24px;
color: #333333;
@@ -358,6 +360,9 @@ span.expand.show, span.contract.show {
#footer {
margin-left: 0px;
}
+ .main-content .edit-link {
+ margin-right: 0px; /* container takes care of right margin */
+ }
#menu ul li.toc-categories {
display: inline-block;
@@ -412,9 +417,6 @@ span.expand.show, span.contract.show {
.main-content-wrapper {
width: 1092px;
}
- div.doc-nav {
- margin-left: 30px;
- }
.main-content
{
margin-left: 313px;
@@ -425,6 +427,12 @@ span.expand.show, span.contract.show {
#footer .wrapper {
margin-left: 293px;
}
+ .breadcrumbs {
+ margin-left: 0px;
+ }
+ .breadcrumbs li:first-of-type {
+ margin-left: 301px;
+ }
}
/*
div.page-wrap:after {
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index 99d4c5a..9aeed3e 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -1,6 +1,3 @@
-nav.breadcrumbs{
- margin-left: -8px;
-}
#menu ul li.toc-categories {
display:none;
}
@@ -35,6 +32,9 @@ nav.breadcrumbs{
.mw {
min-width: 0px;
}
+ .breadcrumbs li:first-of-type {
+ margin-left: 8px;
+ }
#menu ul li.logo {
padding-left: 30px;
}
@@ -195,7 +195,7 @@ nav.breadcrumbs{
text-align: left;
padding-left: 70px;
}
- table.intro td.ag, table.intro td.fl, table.intro td.fa {
+ table.intro td.ag, table.intro td.fl, table.intro td.fam {
background-position: 30px 23%;
}
table.intro p {
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index ed8fbe5..8ec44af 100755
--- a/css/style.css
+++ b/css/style.css
@@ -89,7 +89,7 @@ a.anchor {
#menu ul li a {
color:#FFF;
text-decoration:none;
- line-height:51px;
+ line-height:50px;
padding:14px 20px;
}
/*
@@ -104,7 +104,7 @@ a.anchor {
font-size:12px;
text-transform:uppercase;
}
-#menu ul li.d a .fa {
+#menu ul li.d a .fam {
position: relative;
right: 8px;
font-size: 14px;
@@ -119,9 +119,8 @@ a.anchor {
}
#menu ul li.d a {
- padding:0 30px 0 40px;
+ padding:0px 30px 0 40px;
display:block;
- height:50px;
}
@@ -244,7 +243,7 @@ a.anchor {
background-image:url(../images/flexibility-w.png);
}
-#subhead ul li.fa a {
+#subhead ul li.fam a {
background-image:url(../images/familiarity-w.png);
}
@@ -499,7 +498,7 @@ table.intro td.fl {
background-image:url(../images/flexibility.png);
}
-table.intro td.fa {
+table.intro td.fam {
background-image:url(../images/familiarity.png);
}
@@ -697,10 +696,15 @@ table.intro a {
}
.int_text {
- margin:40px auto 60px auto;
+ margin:40px auto 30px auto;
width:780px;
}
+/* Blog */
+div.post.int_text {
+ margin:40px auto 60px auto;
+}
+
.int_text a, .int_title a {
color:#1a6bc7;
/* font-weight:normal; */
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/docs.html
----------------------------------------------------------------------
diff --git a/docs.html b/docs.html
index 81ba12a..f00adf8 100644
--- a/docs.html
+++ b/docs.html
@@ -1,6 +1,12 @@
---
layout: docpage
title: Documentation
+noChildren: true
+relative_path: 'docs.html'
---
- Welcome to the Apache Drill Documentation. If you're new to Drill, try out one of these resources:
+
+Welcome to the Apache Drill Documentation. If you're new to Drill, try out one of these resources:
+<ul>
+ <li><a href="{{ site.baseurl }}/docs/analyzing-the-yelp-academic-dataset/">Analyzing the Yelp Academic Dataset</a></li>
+</ul>
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 6485fc0..a3351af 100755
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@ layout: default
<p>Analyze semi-structured/nested data coming from NoSQL applications</p>
<span><a href="#flexibility">LEARN MORE</a></span>
</td>
- <td class="fa">
+ <td class="fam">
<h1>Familiarity</h1>
<p>Leverage existing SQL skillsets, BI tools and Apache Hive deployments</p>
<span><a href="#familiarity">LEARN MORE</a></span>
http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/js/drill.js
----------------------------------------------------------------------
diff --git a/js/drill.js b/js/drill.js
index bf276f8..8e808db 100644
--- a/js/drill.js
+++ b/js/drill.js
@@ -116,8 +116,10 @@ Drill.Docs = {
// This relies on .sidebar's 'left' attribute...may be a cleaner approach
if($(".sidebar").css('left') == '0px'){
Drill.Docs._contractSidebar();
+ //Drill.Docs._contractView();
} else {
Drill.Docs._expandSidebar();
+ //Drill.Docs._expandView();
}
})
},
@@ -202,10 +204,20 @@ Drill.Docs = {
$(".sidebar").addClass("force-expand");
},
+ _expandView : function(){
+ $("nav.breadcrumbs li:first").addClass("force-expand");
+ $(".main-content").addClass("force-expand");
+ },
+
_contractSidebar : function() {
$(".sidebar").removeClass("force-expand");
},
+ _contractView : function() {
+ $("nav.breadcrumbs li:first").removeClass("force-expand");
+ $(".main-content").removeClass("force-expand");
+ },
+
_make_current : function(that) {
Drill.Docs._remove_current();
$(that).addClass("current_section");