Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rebased

Browse source
This commit is contained in:
Jongyoul Lee 2015-07-03 12:41:39 +09:00
parent 8a7bf47d8f
commit 682986e6a7
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
zeppelin-web/src/app/home/home.css
View file

@ -184,7 +184,7 @@ a.navbar-brand:hover {
margin-bottom: 20px;
}
.box,
.box,
.well {
background-color: #ffffff;
border-color: #e5e5e5;
@ -236,11 +236,15 @@ h6.box-heading{
}
.zeppelin2 {
<<<<<<< HEAD:zeppelin-web/src/app/home/home.css
<<<<<<< HEAD:zeppelin-web/src/app/home/home.css
background-image: url('/assets/images/zepLogo.png');
=======
background-image: url('../images/zepLogo.png');
>>>>>>> [ZEPPELIN-18] Remove setting SPARK_HOME for PySpark:zeppelin-web/app/styles/main.css
=======
background-image: url('../images/zepLogo.png');
>>>>>>> Reset unwanted changes:zeppelin-web/app/styles/main.css
background-repeat: no-repeat;
background-position: right;
background-position-y: 12px;
@ -281,9 +285,9 @@ kbd {
}
/*
temporary fix for bootstrap issue (https://github.com/twbs/bootstrap/issues/5865)
This part should be removed when new version of bootstrap handles this issue.
/*
temporary fix for bootstrap issue (https://github.com/twbs/bootstrap/issues/5865)
This part should be removed when new version of bootstrap handles this issue.
*/
.btn-group > .tooltip + .btn,
.btn-group > .popover + .btn {

2
zeppelin-web/src/index.html
View file

@ -85,7 +85,7 @@ limitations under the License.
<a href="#/interpreter">Interpreter</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right" style="margin-top:10px; margin-right:5px;">
<ul class="nav navbar-nav navbar-right" style="margin-top:10px; margin-right:5px;">
<li class="server-status">
<i class="fa fa-circle" ng-class="{'server-connected':connected, 'server-disconnected':!connected }"></i>
<span ng-show="connected">Connected</span>