Browse Source

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

Torkel Ödegaard 8 năm trước cách đây
mục cha
commit
fdf4bad1b7
3 tập tin đã thay đổi với 11 bổ sung3 xóa
  1. 2 2
      pkg/api/index.go
  2. 1 1
      public/app/core/routes/routes.ts
  3. 8 0
      public/sass/components/_footer.scss

+ 2 - 2
pkg/api/index.go

@@ -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",

+ 1 - 1
public/app/core/routes/routes.ts

@@ -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',

+ 8 - 0
public/sass/components/_footer.scss

@@ -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;
+  }
+}