You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/07/21 09:36:45 UTC
zeppelin git commit: [ZEPPELIN-1208] fixed invaild position user
config button in navbar
Repository: zeppelin
Updated Branches:
refs/heads/master 911b4175e -> daceee568
[ZEPPELIN-1208] fixed invaild position user config button in navbar
### What is this PR for?
icon for connect or disconnect
invalid align in the mobile screen.
See the screen shot.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1208
### How should this be tested?
Loading a web page from a mobile or Minimizing the width web browser.
### Screenshots (if appropriate)
#### before
#### after
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: CloverHearts <cl...@gmail.com>
Author: CloverHearts <cl...@gmail.com>
Closes #1202 from cloverhearts/navbar-userid-padding and squashes the following commits:
8de69bd [CloverHearts] remove empty li tag in navbar
2eca49c [CloverHearts] Merge branch 'master' into navbar-userid-padding
cb055f1 [CloverHearts] fixed user config button in navbar
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/daceee56
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/daceee56
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/daceee56
Branch: refs/heads/master
Commit: daceee568874a1c98c54ae487700858d2300854b
Parents: 911b417
Author: CloverHearts <cl...@gmail.com>
Authored: Tue Jul 19 16:48:26 2016 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Thu Jul 21 18:36:33 2016 +0900
----------------------------------------------------------------------
zeppelin-web/src/components/navbar/navbar.html | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/daceee56/zeppelin-web/src/components/navbar/navbar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index ab84764..6b9e786 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -71,15 +71,13 @@ limitations under the License.
</div>
</form>
</li>
- <li class="nav-component">
- <i ng-if="navbar.connected" class="fa fa-circle server-connected"
- tooltip="WebSocket Connected" tooltip-placement="bottom"></i>
- <i ng-if="!navbar.connected" class="fa fa-circle server-disconnected"
- tooltip="WebSocket Disconnected" tooltip-placement="bottom"></i>
- </li>
- <li>
+ <li style="margin-left: 10px;">
<div class="dropdown">
- <button ng-if="ticket" class="nav-btn dropdown-toggle" type="button" data-toggle="dropdown" style="margin:11px 5px 0 0;">
+ <i ng-if="navbar.connected" class="fa fa-circle server-connected"
+ tooltip="WebSocket Connected" tooltip-placement="bottom" style="margin-top: 7px; margin-right: 0px; vertical-align: top"></i>
+ <i ng-if="!navbar.connected" class="fa fa-circle server-disconnected"
+ tooltip="WebSocket Disconnected" tooltip-placement="bottom" style="margin-top: 7px; vertical-align: top"></i>
+ <button ng-if="ticket" class="nav-btn dropdown-toggle" type="button" data-toggle="dropdown" style="margin:11px 5px 0 0; padding-left: 0px;">
<span class="username">{{ticket.principal}}</span>
<span class="caret" style="margin-bottom: 8px"></span>
</button>