Merge pull request #1548 from getredash/drafts

Improve UI in small resolution:
getredash · Jan 26, 2017 · 25ca061 · 25ca061
2 parents 8140100 + 9aab74d
commit 25ca061
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/client/app/assets/css/redash.css b/client/app/assets/css/redash.css
@@ -597,7 +597,7 @@ div.table-name:hover {
 
 .collapsing,
 .collapse.in {
-    background: #f4f4f4;
+    background: #222;
     padding: 5px 10px;
     transition: all 0.35s ease;
 }

diff --git a/client/app/components/app-header/app-header.html b/client/app/components/app-header/app-header.html
@@ -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>

diff --git a/client/app/index.html b/client/app/index.html
@@ -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>