incubator-zeppelin git commit: Fix navbar-brand image margin

[moon]

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 <fbdkdu...@hanmail.net>

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 <fbdkdu...@hanmail.net>
Authored: Wed Dec 2 13:53:27 2015 +0900
Committer: Lee moon soo <m...@apache.org>
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
 /* <a> */
 .container a {
     color: #4183C4; }
@@ -359,8 +357,6 @@ a.anchor {
     margin: 12px 0; 
 }
 
-=======
->>>>>>> PR_TOOL_MERGE_PR_483
 .container-narrow {
   margin: 0 auto;
 }