From 7831654e38b803a0d3abe56dd92245f6bf479256 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Wed, 20 Nov 2024 06:17:19 +0000 Subject: [PATCH 1/6] Add Avatar Border for Visual Consistency --- models/avatars/avatar.go | 2 +- web_src/css/base.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 9c56e0f9a0fba..04e12f3e90fe0 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -24,7 +24,7 @@ import ( const ( // DefaultAvatarClass is the default class of a rendered avatar - DefaultAvatarClass = "ui avatar tw-align-middle" + DefaultAvatarClass = "ui avatar border tw-align-middle" // DefaultAvatarPixelSize is the default size in pixels of a rendered avatar DefaultAvatarPixelSize = 28 ) diff --git a/web_src/css/base.css b/web_src/css/base.css index b5a39c7af6fbb..a25f985807399 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -462,6 +462,7 @@ img.ui.avatar, .ui.avatar img, .ui.avatar svg { border-radius: var(--border-radius); + border-color: var(--color-secondary); object-fit: contain; aspect-ratio: 1; } From fd4ad21ee25b595f760ef732529a5ab0e4eb6c6f Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Wed, 20 Nov 2024 06:17:19 +0000 Subject: [PATCH 2/6] Add Avatar Border for Visual Consistency --- web_src/css/base.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/css/base.css b/web_src/css/base.css index b5a39c7af6fbb..b5fe6ee946299 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -461,7 +461,9 @@ a.label, img.ui.avatar, .ui.avatar img, .ui.avatar svg { + border: 1px solid; border-radius: var(--border-radius); + border-color: var(--color-secondary); object-fit: contain; aspect-ratio: 1; } From 25f20624abf2ba8aa85985b89f944ed404fc1dfa Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Wed, 27 Nov 2024 00:29:23 +0000 Subject: [PATCH 3/6] Adjust the style on the left side of the profile page --- web_src/css/user.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web_src/css/user.css b/web_src/css/user.css index caabf1834cbb2..372341bbc3d65 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -1,3 +1,8 @@ +.user.profile #profile-avatar-card { + border: none; + background-color: inherit; +} + .user.profile .ui.card .header { display: block; font-weight: var(--font-weight-semibold); From cadfbad2b531c2c05d26c5ac3a048525ab1957c0 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 28 Nov 2024 14:19:56 +0000 Subject: [PATCH 4/6] Optimized the button styles on the right side of the top navigation bar --- templates/base/head_navbar.tmpl | 4 ++-- web_src/css/modules/navbar.css | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 951ee590d1cc7..01cda71e47c52 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -122,10 +122,10 @@
- + {{ctx.AvatarUtils.Avatar .SignedUser 36 "not-mobile"}} + {{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}} {{.SignedUser.Name}} - {{svg "octicon-triangle-down"}}
diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css index 556da2df3b051..d3004d71fbf51 100644 --- a/web_src/css/modules/navbar.css +++ b/web_src/css/modules/navbar.css @@ -39,6 +39,19 @@ border-radius: .28571429rem; } +@media (min-width: 768px) { + + .navbar-right > .item:not(:has(.ui.avatar)) { + border: 1px solid; + border-color: var(--color-secondary); + } + + .navbar-right > .item:has(.ui.avatar) { + padding: 0!important; + } + +} + #navbar .item { min-height: 36px; min-width: 36px; From 8444c78397caf0ba0ccf1568e6a3292e6b2185f4 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Fri, 29 Nov 2024 00:25:37 +0000 Subject: [PATCH 5/6] revert 25f20624abf2ba8aa85985b89f944ed404fc1dfa --- web_src/css/user.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web_src/css/user.css b/web_src/css/user.css index 372341bbc3d65..caabf1834cbb2 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -1,8 +1,3 @@ -.user.profile #profile-avatar-card { - border: none; - background-color: inherit; -} - .user.profile .ui.card .header { display: block; font-weight: var(--font-weight-semibold); From ae44ed2cf6c5e001dc3e3254af67bdcc196bcc78 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Fri, 29 Nov 2024 00:27:24 +0000 Subject: [PATCH 6/6] revert cadfbad2b531c2c05d26c5ac3a048525ab1957c0 --- templates/base/head_navbar.tmpl | 4 ++-- web_src/css/modules/navbar.css | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 01cda71e47c52..951ee590d1cc7 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -122,10 +122,10 @@
- {{ctx.AvatarUtils.Avatar .SignedUser 36 "not-mobile"}} - + {{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}} {{.SignedUser.Name}} + {{svg "octicon-triangle-down"}}
diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css index d3004d71fbf51..556da2df3b051 100644 --- a/web_src/css/modules/navbar.css +++ b/web_src/css/modules/navbar.css @@ -39,19 +39,6 @@ border-radius: .28571429rem; } -@media (min-width: 768px) { - - .navbar-right > .item:not(:has(.ui.avatar)) { - border: 1px solid; - border-color: var(--color-secondary); - } - - .navbar-right > .item:has(.ui.avatar) { - padding: 0!important; - } - -} - #navbar .item { min-height: 36px; min-width: 36px;