Repository: zeppelin Updated Branches: refs/heads/branch-0.6 73d3cf742 -> b84fa2e72
[ZEPPELIN-1208] fixed invaild position user config button in navbar icon for connect or disconnect invalid align in the mobile screen. See the screen shot. Bug Fix https://issues.apache.org/jira/browse/ZEPPELIN-1208 Loading a web page from a mobile or Minimizing the width web browser.     * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: CloverHearts <[email protected]> Author: CloverHearts <[email protected]> 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 (cherry picked from commit daceee568874a1c98c54ae487700858d2300854b) Signed-off-by: Mina Lee <[email protected]> Conflicts: zeppelin-web/src/components/navbar/navbar.html Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b84fa2e7 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b84fa2e7 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b84fa2e7 Branch: refs/heads/branch-0.6 Commit: b84fa2e7276e9ae3fcd13feb70785d8ca1a2f38e Parents: 73d3cf7 Author: CloverHearts <[email protected]> Authored: Tue Jul 19 16:48:26 2016 +0900 Committer: Mina Lee <[email protected]> Committed: Fri Jul 22 16:07:32 2016 +0900 ---------------------------------------------------------------------- zeppelin-web/src/components/navbar/navbar.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b84fa2e7/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 be88a9b..d7c7b7a 100644 --- a/zeppelin-web/src/components/navbar/navbar.html +++ b/zeppelin-web/src/components/navbar/navbar.html @@ -69,15 +69,14 @@ limitations under the License. </span> </div> </form> - <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>
