fergalmoran/dss.web
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.web.git synced 2026-02-15 04:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Navbar fixes

Browse Source
This commit is contained in:
Fergal Moran
2015-12-17 20:21:59 +00:00
parent c04e67cb33
commit b331beb407
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/app/components/navbar/navbar.html
View File

@@ -19,7 +19,7 @@
<span>Upload</span>
</a>
</li>
</ul>n
</ul>
<div class="col-sm-6 col-md-6">
<form class="navbar-form" role="search">
<div class="input-group">
@@ -47,9 +47,11 @@
</li>
<li id="navbar-profile-dropdown" class="dropdown" ng-if="$root.currentUser">
<a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{ $root.currentUser.display_name }}
<a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{
$root.currentUser.display_name }}
<b class="caret"></b>
<img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}" alt="">
<img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}"
alt="">
</a>
<ul class="dropdown-menu">
<li>
@@ -81,7 +83,8 @@
class="fa fa-twitter"></i> Twitter</a>
</li>
<li>
<a ng-click="doLogin('google')" class="btn btn-google"><i class="fa fa-google"></i>
<a ng-click="doLogin('google')" class="btn btn-google"><i
class="fa fa-google"></i>
Google</a>
</li>
</ul>

11
client/app/components/navbar/navbar.less
View File

@@ -52,11 +52,12 @@ nav > div.collapse.navbar-collapse > ul > li > a {
.notification-label {
position: absolute !important;
top: 5px !important;;
font-size: 11px !important;;
font-weight: 400 !important;;
padding: 0 3px !important;;
line-height: 14px !important;;
top: 5px !important;
left: 22px !important;
font-size: 11px !important;
font-weight: 400 !important;
padding: 0 3px !important;
line-height: 14px !important;
}
#notifications-button {

14
client/app/directives/notifications/notifications.less
View File

@@ -4,5 +4,17 @@
}
.notification-new {
font-weight: bold!important;
font-weight: bold !important;
}
.notification-details-profile-image {
float: left;
width: 40px;
}
.notification-details {
margin-left: 10px;
padding-left: 15px;
max-width: 210px;
overflow: hidden;
}