mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-29 19:18:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #470 from cachethq/sidebar-enhancements

Browse Source 
Added dropdown account settings and fix jumping active
This commit is contained in:
James Brooks 2015-02-23 06:53:44 +00:00
commit bf1ed552c6
6 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/sass/partials/_sidebar.scss
View File

@ -23,13 +23,20 @@ body.dashboard {
list-style: none;
.profile {
padding: 20px;
padding: 20px 10px;
margin-bottom: 0;
.dropdown-toggle {
text-decoration: none;
}
.dropdown-menu {
top: 108%;
}
.avatar {
width: 70px;
width: 60px;
margin-right: 10px;
img {
border-radius: 50%;
width: 60px;
width: 50px;
}
}
.profile {
@ -56,9 +63,11 @@ body.dashboard {
}
&.active {
background: lighten($sidebar-background-color, 2%);
border-top: 1px solid #BED3EA;
border-bottom: 1px solid #BED3EA;
a {
padding-top: 14px;
padding-bottom: 14px;
border-top: 1px solid #BED3EA;
border-bottom: 1px solid #BED3EA;
color: $sidebar-text-active-color;
}
}

22
app/views/partials/dashboard/sidebar.blade.php
View File

@ -3,16 +3,20 @@
<div class="sidebar-inner">
<div class="profile">
<div class="row">
<div class="col-xs-3">
<div class="avatar">
<a href="{{ url('dashboard/user') }}">
<img src="{{ $loggedUser->gravatar }}" alt="">
<div class="col-xs-12">
<div class="dropdown">
<a class="dropdown-toggle" href="#" id="profile-dropdown" data-toggle="dropdown" aria-expanded="true">
<span class="avatar"><img src="{{ $loggedUser->gravatar }}"></span> <span class="username">{{ $loggedUser->username }}</span>
<span class="caret"></span>
</a>
</div>
</div>
<div class="col-xs-9 username-wrapper">
<div class="profile pull-left">
<div class="username">{{ $loggedUser->username }}</div>
<ul class="dropdown-menu" role="menu" aria-labelledby="profile-dropdown">
<li role="presentation">
<a role="menuitem" tabindex="-1" href="{{ url('dashboard/user') }}">{{ trans('dashboard.team.profile') }}</a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="{{ route('logout') }}">{{ trans('dashboard.logout') }}</a>
</li>
</ul>
</div>
</div>
</div>

2
public/build/dist/css/all-3929b4f6.css → public/build/dist/css/all-f4dd3c69.css vendored
View File

File diff suppressed because one or more lines are too long

11
public/build/dist/js/all-38248441.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

13
public/build/dist/js/all-3f815dae.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/build/rev-manifest.json
View File

@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-3929b4f6.css",
"dist/js/all.js": "dist/js/all-3f815dae.js"
"dist/css/all.css": "dist/css/all-f4dd3c69.css",
"dist/js/all.js": "dist/js/all-38248441.js"
}