jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Further refine navbar markup and styling

Browse Source
This commit is contained in:
Zsolt Kocsmarszky
2017-11-13 17:07:59 +01:00
parent 43bf4b1cc8
commit a26195848a
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/app/assets/css/redash-newstyle.less
View File

@@ -149,6 +149,12 @@ page-header, .dashboard__header {
}
}
.dropdown-menu--profile {
li {
width: 200px;
}
}
// Mobile fixes
.navbar .collapse.in {
@@ -167,6 +173,12 @@ page-header, .dashboard__header {
.navbar .collapse.in {
border: none;
.dropdown-menu--profile {
li {
width: auto;
}
}
.nav__main li a {
padding: 10px 15px;
display: block;

48
client/app/components/app-header/app-header.html
View File

@@ -50,29 +50,47 @@
<!-- Profile -->
<ul class="nav navbar-nav navbar-right">
<li ng-show="$ctrl.currentUser.isAdmin">
<a href="data_sources" title="Data Sources"><i class="fa fa-database"></i></a>
</li>
<li ng-show="$ctrl.showSettingsMenu">
<a href="users" title="Settings"><i class="fa fa-cog"></i></a>
<a href="data_sources" title="Data Sources"><i class="fa fa-sliders" aria-hidden="true"></i></a>
</li>
<!--<li ng-show="$ctrl.showSettingsMenu">-->
<!--<a href="users" title="Settings"><i class="fa fa-cog"></i></a>-->
<!--</li>-->
<li class="dropdown" uib-dropdown>
<a href="#" class="dropdown-toggle dropdown--profile" uib-dropdown-toggle>
<img ng-src="{{$ctrl.currentUser.gravatar_url}}" class="profile__image--navbar" width="20"/>
<span ng-bind="$ctrl.currentUser.name"></span> <span
class="caret"></span></a>
<ul class="dropdown-menu" dropdown-menu>
<li style="width:200px">
<a ng-href="users/{{$ctrl.currentUser.id}}">
Account Settings
</a>
<ul class="dropdown-menu dropdown-menu--profile">
<li>
<a ng-href="users/{{$ctrl.currentUser.id}}">Edit Profile</a>
</li>
<li>
<a ng-href="query_snippets">Query Snippets</a>
</li>
<li class="divider" ng-if="$ctrl.currentUser.hasPermission('super_admin')">
<li ng-if="$ctrl.currentUser.hasPermission('super_admin')"><a href="admin/status">System Status</a></li>
<li class="divider">
</li>
<li>
<a ng-click="$ctrl.logout()">Log out</a>
</li>
<li ng-show="$ctrl.currentUser.isAdmin">
<a href="data_sources" title="Data Sources">Data Sources</a>
</li>
<li ng-show="$ctrl.showSettingsMenu">
<a href="groups" title="Settings">Groups</a>
</li>
<li ng-show="$ctrl.showSettingsMenu">
<a href="users" title="Settings">Users</a>
</li>
<li ng-show="$ctrl.showSettingsMenu">
<a href="destinations" title="Settings">Alert Destinations</a>
</li>
<li class="divider"></li>
<li ng-if="$ctrl.currentUser.hasPermission('super_admin')"><a href="admin/status">System Status</a></li>
<li class="divider"></li>
<li>
<a ng-click="$ctrl.logout()">Log out</a>
</li>
</ul>
</li>
</ul>