Author: moon
Date: Thu Dec 3 23:55:37 2015
New Revision: 1717882
URL: http://svn.apache.org/viewvc?rev=1717882&view=rev
Log:
https://github.com/apache/incubator-zeppelin/pull/500
Modified:
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/style.css
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml
Modified:
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/style.css
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/style.css?rev=1717882&r1=1717881&r2=1717882&view=diff
==============================================================================
---
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/style.css
(original)
+++
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/style.css
Thu Dec 3 23:55:37 2015
@@ -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;
}
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml?rev=1717882&r1=1717881&r2=1717882&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml Thu Dec 3
23:55:37 2015
@@ -4,7 +4,7 @@
<title>Apache Zeppelin (incubating)</title>
<link href="http://zeppelin.incubator.apache.org/"; rel="self"/>
<link href="http://zeppelin.incubator.apache.org"/>
- <updated>2015-12-02T07:22:17+09:00</updated>
+ <updated>2015-12-04T08:55:26+09:00</updated>
<id>http://zeppelin.incubator.apache.org</id>
<author>
<name>The Apache Software Foundation</name>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml?rev=1717882&r1=1717881&r2=1717882&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml Thu Dec 3
23:55:37 2015
@@ -5,8 +5,8 @@
<description>Apache Zeppelin (incubating) - The Apache Software
Foundation</description>
<link>http://zeppelin.incubator.apache.org</link>
<link>http://zeppelin.incubator.apache.org</link>
- <lastBuildDate>2015-12-02T07:22:17+09:00</lastBuildDate>
- <pubDate>2015-12-02T07:22:17+09:00</pubDate>
+ <lastBuildDate>2015-12-04T08:55:26+09:00</lastBuildDate>
+ <pubDate>2015-12-04T08:55:26+09:00</pubDate>
<ttl>1800</ttl>
