Return-Path: X-Original-To: apmail-zeppelin-commits-archive@minotaur.apache.org Delivered-To: apmail-zeppelin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0BACD186ED for ; Thu, 3 Dec 2015 23:52:30 +0000 (UTC) Received: (qmail 87624 invoked by uid 500); 3 Dec 2015 23:52:30 -0000 Delivered-To: apmail-zeppelin-commits-archive@zeppelin.apache.org Received: (qmail 87578 invoked by uid 500); 3 Dec 2015 23:52:30 -0000 Mailing-List: contact commits-help@zeppelin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zeppelin.incubator.apache.org Delivered-To: mailing list commits@zeppelin.incubator.apache.org Received: (qmail 87569 invoked by uid 99); 3 Dec 2015 23:52:29 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 23:52:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 64EEB180B2D for ; Thu, 3 Dec 2015 23:52:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 3By_J-WhMVth for ; Thu, 3 Dec 2015 23:52:15 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id D955E42AD4 for ; Thu, 3 Dec 2015 23:52:14 +0000 (UTC) Received: (qmail 87508 invoked by uid 99); 3 Dec 2015 23:52:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 23:52:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C1FDE6836; Thu, 3 Dec 2015 23:52:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: moon@apache.org To: commits@zeppelin.incubator.apache.org Message-Id: <4c3a83ca23244f0caf046338238b0c18@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-zeppelin git commit: Fix navbar-brand image margin Date: Thu, 3 Dec 2015 23:52:14 +0000 (UTC) Repository: incubator-zeppelin Updated Branches: refs/heads/master f29b4a60b -> 9a8779bdd Fix navbar-brand image margin Currently, because of overlapping #483 #469, http://zeppelin.incubator.apache.org/docs/0.6.0-incubating-SNAPSHOT/ navbar-brand image location is little bit wired. ![before](https://github.com/AhyoungRyu/Platform-Documentation/blob/master/compared_img/Before_NavbarImg.png?raw=true) So I fixed this. Additionally, I deleted some traces generated by last merge. Author: Ryu Ah young Closes #500 from AhyoungRyu/fix-navbar-brand-img-margin and squashes the following commits: 16984b3 [Ryu Ah young] fix navbar-brand image margin Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/9a8779bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/9a8779bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/9a8779bd Branch: refs/heads/master Commit: 9a8779bdd742f608b6131ec80010173acd232d4f Parents: f29b4a6 Author: Ryu Ah young Authored: Wed Dec 2 13:53:27 2015 +0900 Committer: Lee moon soo Committed: Fri Dec 4 08:53:10 2015 +0900 ---------------------------------------------------------------------- docs/assets/themes/zeppelin/css/style.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/9a8779bd/docs/assets/themes/zeppelin/css/style.css ---------------------------------------------------------------------- diff --git a/docs/assets/themes/zeppelin/css/style.css b/docs/assets/themes/zeppelin/css/style.css index ccbd092..066dd84 100644 --- a/docs/assets/themes/zeppelin/css/style.css +++ b/docs/assets/themes/zeppelin/css/style.css @@ -15,6 +15,10 @@ body { padding-bottom: 10px; } +.navbar-brand img { + margin: 0; +} + .navbar { background: #3071a9; border-bottom: 0px; @@ -209,13 +213,8 @@ body { /* Table for property */ .table-configuration { -<<<<<<< HEAD width : 100%; border : 1px solid gray; -======= - width: 800px; - border: 1px solid gray; ->>>>>>> PR_TOOL_MERGE_PR_483 } .table-configuration tr td { border: 1px solid gray; @@ -238,7 +237,6 @@ body { } /* Custom container */ -<<<<<<< HEAD /* */ .container a { color: #4183C4; } @@ -359,8 +357,6 @@ a.anchor { margin: 12px 0; } -======= ->>>>>>> PR_TOOL_MERGE_PR_483 .container-narrow { margin: 0 auto; }