Commit fdf4bad1 by Torkel Ödegaard

fix: sidemenu profile main text is now username instead of name

parent 7bec1955
......@@ -120,8 +120,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
if c.IsSignedIn {
profileNode := &dtos.NavLink{
Text: c.SignedInUser.Name,
SubTitle: c.SignedInUser.Login,
Text: c.SignedInUser.Login,
SubTitle: c.SignedInUser.Name,
Id: "profile",
Img: data.User.GravatarUrl,
Url: setting.AppSubUrl + "/profile",
......
......@@ -199,7 +199,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
.when('/login', {
templateUrl: 'public/app/partials/login.html',
controller : 'LoginCtrl',
pageClass: 'sidemenu-hidden',
pageClass: 'login-page sidemenu-hidden',
})
.when('/invite/:code', {
templateUrl: 'public/app/partials/signup_invited.html',
......
......@@ -6,6 +6,7 @@
color: $footer-link-color;
padding: 5rem 0 1rem 0;
font-size: $font-size-sm;
position: relative;
width: 98%; /* was causing horiz scrollbars - need to examine */
a {
......@@ -36,3 +37,10 @@
}
}
}
.login-page {
.footer {
position: absolute;
bottom: $spacer;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment