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/04 17:48:08 UTC
[16/19] drill git commit: [Finish Card 43, 44, 45,
46] making content expand out with sidebar when force expanded.
Making search bar usable on iphone by making menu not position fixed,
thus allowing keyboard to pop up on mobile device and content to scroll
[Finish Card 43,44,45,46] making content expand out with sidebar when
force expanded. Making search bar usable on iphone by making menu not
position fixed, thus allowing keyboard to pop up on mobile device and
content to scroll up as needed. Adding margin to mobile blog posts.
Taking out JS that does the same for the menu as position: fixed.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/ffc9c276
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/ffc9c276
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/ffc9c276
Branch: refs/heads/gh-pages
Commit: ffc9c27611f27051145de14b133ae443d3a4d4a4
Parents: be77483
Author: Danny <dk...@batchblue.com>
Authored: Mon May 4 09:35:37 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Mon May 4 09:35:37 2015 -0400
----------------------------------------------------------------------
css/docpage.css | 21 ++++++++++++++++++---
css/responsive.css | 33 +++++++++++++++++++++++++--------
css/style.css | 3 +++
js/drill.js | 12 +++++++-----
js/script.js | 12 ++++++------
5 files changed, 59 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/ffc9c276/css/docpage.css
----------------------------------------------------------------------
diff --git a/css/docpage.css b/css/docpage.css
index 47c0201..d7cf704 100644
--- a/css/docpage.css
+++ b/css/docpage.css
@@ -284,8 +284,12 @@ span.expand.show, span.contract.show {
Need menu click to make sidebar appear */
@media (max-width: 1024px) {
- #footer {
+ div#footer {
margin-left: 0px;
+ width: 100%;
+ }
+ div#footer .wrapper {
+ padding: 0 20px;
}
.main-content .edit-link {
margin-right: 0px; /* container takes care of right margin */
@@ -299,7 +303,7 @@ span.expand.show, span.contract.show {
#menu ul li.logo {
padding-left: 0px;
}
- #menu ul li.force-expand.toc-categories {
+ #menu.force-expand ul li.toc-categories {
display: inline-block;
}
@@ -329,7 +333,12 @@ span.expand.show, span.contract.show {
.sidebar.reveal {
left: 0;
}
-
+ .main-content.force-expand {
+ margin-left: 313px;
+ }
+ #footer.force-expand .wrapper {
+ margin-left: 313px;
+ }
.main-content{
margin: 0px 20px 0px 20px;
}
@@ -342,6 +351,9 @@ span.expand.show, span.contract.show {
.page-wrap #footer {
width: auto;
}
+ .breadcrumbs.force-expand li:first-of-type {
+ margin-left: 301px;
+ }
}
@media (min-width: 1025px) {
.main-content-wrapper {
@@ -357,6 +369,9 @@ span.expand.show, span.contract.show {
#footer .wrapper {
margin-left: 313px;
}
+ #footer {
+ width: 100%;
+ }
.breadcrumbs {
margin-left: 0px;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/ffc9c276/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index 8f4f4b8..b5ba351 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -60,17 +60,17 @@
width: auto;
margin: 20px 10px 100px 20px;
}
- #menu ul li.force-expand, #menu ul li.d.force-expand {
+ #menu.force-expand ul li, #menu.force-expand ul li.d {
display:inline-block;
}
- #menu ul li.force-expand.toc-categories {
+ #menu.force-expand ul li.toc-categories {
display: none;
}
- #menu ul li.force-expand ul li{
+ #menu.force-expand ul li ul li{
display:block;
}
- #menu ul li.force-expand.nav, #menu ul li.force-expand#twitter-menu-item {
+ #menu.force-expand ul li.nav, #menu.force-expand ul li#twitter-menu-item {
clear:both;
margin: 0 auto;
}
@@ -101,13 +101,22 @@
margin-right: 10px;
}
+ /* Blog Posts */
+
+ div.post.int_text {
+ margin: 40px 20px 20px 20px;
+ }
+ div.post .post-header .int_title {
+ margin-left: 0px;
+ }
+
}
@media (max-width: 768px) {
- #menu ul li.force-expand.nav {
+ #menu.force-expand ul li.nav {
clear:both;
margin: 0 auto;
}
- #menu ul li.force-expand.search-bar {
+ #menu.force-expand ul li.search-bar {
clear:both;
}
@@ -125,6 +134,11 @@
img {
max-width: 100%;
}
+
+ /* Search page */
+ div.int_search {
+ width: 100%;
+ }
}
@media (max-width: 570px) {
@@ -134,12 +148,12 @@
/* Responsive Menu 570 max width */
- #menu ul li.force-expand.nav, #menu ul li.force-expand#twitter-menu-item {
+ #menu.force-expand ul li.nav, #menu.force-expand ul li#twitter-menu-item {
clear: both;
width: 100%;
margin: auto;
}
- #menu ul li.force-expand {
+ #menu.force-expand ul li {
display:block;
}
#menu ul li.clear-float{
@@ -157,6 +171,9 @@
clear: both;
float: right;
}
+ #menu.force-expand {
+ position: relative;
+ }
/* Responsive Homepage 570 max width */
#header .scroller .item .tc h1{
http://git-wip-us.apache.org/repos/asf/drill/blob/ffc9c276/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index a696884..1a34217 100755
--- a/css/style.css
+++ b/css/style.css
@@ -44,9 +44,12 @@ a.anchor {
z-index:5;
}
+/* This seems to override menu position fixed. Fixed positioning allows menu to always be available at the top of the viewport, and JS is not needed to do this */
+/*
#menu.r {
position:absolute;
}
+*/
#menu ul {
background:#051221;
http://git-wip-us.apache.org/repos/asf/drill/blob/ffc9c276/js/drill.js
----------------------------------------------------------------------
diff --git a/js/drill.js b/js/drill.js
index c3da037..b484955 100644
--- a/js/drill.js
+++ b/js/drill.js
@@ -39,11 +39,11 @@ Drill.Site = {
},
expandMenu: function(){
- $("#menu ul li").addClass("force-expand");
+ $("#menu").addClass("force-expand");
},
contractMenu: function() {
- $("#menu ul li").removeClass("force-expand");
+ $("#menu").removeClass("force-expand");
},
watchSearchBarMouseEnter: function() {
@@ -127,10 +127,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();
+ Drill.Docs._contractView();
} else {
Drill.Docs._expandSidebar();
- //Drill.Docs._expandView();
+ Drill.Docs._expandView();
}
})
},
@@ -216,8 +216,9 @@ Drill.Docs = {
},
_expandView : function(){
- $("nav.breadcrumbs li:first").addClass("force-expand");
+ $("nav.breadcrumbs").addClass("force-expand");
$(".main-content").addClass("force-expand");
+ $("#footer").addClass("force-expand");
},
_contractSidebar : function() {
@@ -227,6 +228,7 @@ Drill.Docs = {
_contractView : function() {
$("nav.breadcrumbs li:first").removeClass("force-expand");
$(".main-content").removeClass("force-expand");
+ $("#footer").removeClass("force-expand");
},
_make_current : function(that) {
http://git-wip-us.apache.org/repos/asf/drill/blob/ffc9c276/js/script.js
----------------------------------------------------------------------
diff --git a/js/script.js b/js/script.js
index 4657de2..1e98b8d 100755
--- a/js/script.js
+++ b/js/script.js
@@ -88,12 +88,12 @@ function moveReel(direction) {
function onScroll() {
var ST = document.body.scrollTop || document.documentElement.scrollTop;
- if ($("#menu.r").length) {
- $("#menu.r").css({ top: ST+"px" });
- } else {
- $("#menu").css({ top: "0px" });
- }
+ //if ($("#menu.r").length) {
+ // $("#menu.r").css({ top: ST+"px" });
+ //} else {
+ // $("#menu").css({ top: "0px" });
+ //}
if (ST > 400) $("#subhead").addClass("show");
else $("#subhead").removeClass("show");
-}
\ No newline at end of file
+}