Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve UI in small resolution: #1548

Merged
merged 1 commit into from
Jan 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/app/assets/css/redash.css
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ div.table-name:hover {

.collapsing,
.collapse.in {
background: #f4f4f4;
background: #222;
padding: 5px 10px;
transition: all 0.35s ease;
}
Expand Down
8 changes: 4 additions & 4 deletions client/app/components/app-header/app-header.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<nav class="navbar navbar-inverse navbar-fixed-top app-header" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<button type="button" class="navbar-toggle" ng-click="isNavOpen = !isNavOpen">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img ng-src="{{$ctrl.logoUrl}}"/></a>
</div>
<div class="collapse navbar-collapse navbar-ex1-collapse">
<div class="collapse navbar-collapse" uib-collapse="!isNavOpen">
<ul class="nav navbar-nav">
<li class="dropdown" ng-show="$ctrl.showDashboardsMenu" uib-dropdown>
<a href="#" class="dropdown-toggle" uib-dropdown-toggle title="Dashboards">
<span class="visible-md visible-lg">Dashboards <b class="caret"></b></span>
<span class="visible-xs visible-sm"><i class="zmdi zmdi-view-dashboard"></i> <b class="caret"></b></span>
<span class="visible-xs visible-md visible-lg">Dashboards <b class="caret"></b></span>
<span class="visible-sm"><i class="zmdi zmdi-view-dashboard"></i> <b class="caret"></b></span>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li><a ng-show="$ctrl.currentUser.hasPermission('create_dashboard')" ng-click="$ctrl.newDashboard()">New Dashboard</a></li>
Expand Down
1 change: 1 addition & 0 deletions client/app/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html ng-app="app">
<head lang="en">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<base href="/">
<title>Redash</title>
Expand Down