Skip to content

Commit

Permalink
Reset unwanted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jongyoul committed Jun 25, 2015
1 parent f50f2e6 commit f030cca
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion zeppelin-web/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<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>
Expand Down
12 changes: 6 additions & 6 deletions zeppelin-web/app/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ a.navbar-brand:hover {
margin-bottom: 20px;
}

.box,
.box,
.well {
background-color: #ffffff;
border-color: #e5e5e5;
Expand Down Expand Up @@ -228,15 +228,15 @@ h6.box-heading{


.zeppelin {
background-image: url('../images/zepLogo.png');
background-image: url('../images/zepLogo.png');
background-repeat: no-repeat;
background-position: right;
height: 380px;
opacity: 0.2;
}

.zeppelin2 {
background-image: url('../images/zepLogo.png');
background-image: url('../images/zepLogo.png');
background-repeat: no-repeat;
background-position: right;
background-position-y: 12px;
Expand Down Expand Up @@ -277,9 +277,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 {
Expand Down

0 comments on commit f030cca

Please sign in to comment.