From 530806f727ade5f5201a165939a20792c3f7fac3 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 30 Aug 2023 16:34:43 +0530 Subject: [PATCH 01/18] Added archived label for org labels and added into issue filter list. Signed-off-by: puni9869 --- templates/repo/issue/filters.tmpl | 9 ++++++++- templates/repo/issue/labels/label_list.tmpl | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index b482e471e1d4d..5a0765fb20d4a 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -29,7 +29,14 @@
{{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} + {{RenderLabel $.Context .}} + {{if not .ArchivedUnix.IsZero}} + + {{$.locale.Tr "home.archived"}} + + {{end}} + {{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index b29e606baa415..8df6ee7052fdb 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -75,10 +75,15 @@
  • {{RenderLabel $.Context .}} + {{if not .ArchivedUnix.IsZero}} + + {{$.locale.Tr "home.archived"}} + + {{end}} {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    - {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}} + {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}
    • From d8866d7da816a43476315273cc935a7066b2c528 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Thu, 31 Aug 2023 17:05:06 +0530 Subject: [PATCH 02/18] Ui fixes and changing archived label hint and ui --- options/locale/locale_en-US.ini | 4 ++- templates/repo/issue/filters.tmpl | 8 +++--- templates/repo/issue/labels/label_list.tmpl | 30 +++++++++++---------- web_src/css/repo/issue-label.css | 7 ++++- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 401692388e5d4..b41720767f3c9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -123,6 +123,8 @@ unpin = Unpin artifacts = Artifacts +archived = Archived + concept_system_global = Global concept_user_individual = Individual concept_code_repository = Repository @@ -317,7 +319,6 @@ filter_by_team_repositories = Filter by team repositories feed_of = Feed of "%s" show_archived = Archived -archived = Archived show_both_archived_unarchived = Showing both archived and unarchived show_only_archived = Showing only archived show_only_unarchived = Showing only unarchived @@ -1335,6 +1336,7 @@ issues.filter_assignees = Filter Assignee issues.filter_milestones = Filter Milestone issues.filter_projects = Filter Project issues.filter_labels = Filter Label +issues.filter.archived_label_msg = Label is archived. issues.filter_reviewers = Filter Reviewer issues.new = New Issue issues.new.title_empty = Title cannot be empty diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index 5a0765fb20d4a..bd48603ef8c41 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -29,11 +29,11 @@
    {{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} - {{if not .ArchivedUnix.IsZero}} - - {{$.locale.Tr "home.archived"}} + {{if .IsArchived}} + + {{svg "octicon-archive"}} {{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 8df6ee7052fdb..b6ce973b0b98b 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -33,11 +33,6 @@
  • {{RenderLabel $.Context .}} - {{if not .ArchivedUnix.IsZero}} - - {{$.locale.Tr "home.archived"}} - - {{end}} {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    @@ -47,14 +42,21 @@ {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}} {{end}}
    -
    - {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} - {{else if $.PageIsOrgSettingsLabels}} - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} +
    + {{if .IsArchived}} + + {{$.locale.Tr "archived"}} + {{end}} +
    + {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{else if $.PageIsOrgSettingsLabels}} + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{end}} +
    • {{end}} @@ -75,7 +77,7 @@
  • {{RenderLabel $.Context .}} - {{if not .ArchivedUnix.IsZero}} + {{if .IsArchived}} {{$.locale.Tr "home.archived"}} @@ -83,7 +85,7 @@ {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    - {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}} + {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}
    • diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index a2eb0344a5013..372a6be46daa4 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -30,7 +30,6 @@ .issue-label-list .item .label-operation { width: 33%; - text-align: right; } .issue-label-list .item a { @@ -42,3 +41,9 @@ .issue-label-list .item.org-label { opacity: 0.7; } + +.ui.archived-label { + width: fit-content; + height: fit-content; + text-transform: lowercase; +} From fcee97baac6eac0058ffa99397d00f3540407c24 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Thu, 31 Aug 2023 20:09:50 +0530 Subject: [PATCH 03/18] Translations change --- templates/repo/issue/labels/label_list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index b6ce973b0b98b..73c8d8c6e4736 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -79,7 +79,7 @@ {{RenderLabel $.Context .}} {{if .IsArchived}} - {{$.locale.Tr "home.archived"}} + {{$.locale.Tr "archived"}} {{end}} {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}} From f1168a48fa9c4e0539692e7f2e302bc5fa4b96e6 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Thu, 31 Aug 2023 21:06:33 +0530 Subject: [PATCH 04/18] Reordering the archive hint in org labels --- templates/repo/issue/labels/label_list.tmpl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 73c8d8c6e4736..f3ede34cfbede 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -77,17 +77,18 @@
  • {{RenderLabel $.Context .}} - {{if .IsArchived}} - - {{$.locale.Tr "archived"}} - - {{end}} {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}
    -
    +
    + {{if .IsArchived}} + + {{$.locale.Tr "archived"}} + + {{end}} +
    • {{end}} {{end}} From 541f1a40fbf5e7ac8a3eb45ca80ba59571453f82 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Fri, 1 Sep 2023 15:30:46 +0530 Subject: [PATCH 05/18] Styling the label in label page and issue filter --- options/locale/locale_en-US.ini | 1 - templates/repo/issue/filters.tmpl | 4 ++-- templates/repo/issue/labels/label_list.tmpl | 4 ++-- web_src/css/repo/issue-label.css | 6 ++++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b41720767f3c9..d8adc1be5fa84 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1336,7 +1336,6 @@ issues.filter_assignees = Filter Assignee issues.filter_milestones = Filter Milestone issues.filter_projects = Filter Project issues.filter_labels = Filter Label -issues.filter.archived_label_msg = Label is archived. issues.filter_reviewers = Filter Reviewer issues.new = New Issue issues.new.title_empty = Title cannot be empty diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index bd48603ef8c41..d9495f52ef5ca 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -32,8 +32,8 @@ {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} {{if .IsArchived}} - - {{svg "octicon-archive"}} + + {{$.locale.Tr "archived"}} {{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index f3ede34cfbede..8dad2e4685e77 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -44,7 +44,7 @@
    {{if .IsArchived}} - + {{$.locale.Tr "archived"}} {{end}} @@ -84,7 +84,7 @@
    {{if .IsArchived}} - + {{$.locale.Tr "archived"}} {{end}} diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index 372a6be46daa4..9eda7828ed3d5 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -42,8 +42,10 @@ opacity: 0.7; } -.ui.archived-label { +.archived-label { + display: inline-flex; width: fit-content; height: fit-content; - text-transform: lowercase; + color: var(--color-text-light); + background: var(--color-button); } From 4b5154278408a5454fb14bcfc0b6e7de9c247d14 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Fri, 1 Sep 2023 15:37:38 +0530 Subject: [PATCH 06/18] Linter --- templates/repo/issue/filters.tmpl | 10 +++++----- templates/repo/issue/labels/label_list.tmpl | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index d9495f52ef5ca..9aba7d0d7b652 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -31,11 +31,11 @@ {{$previousExclusiveScope = $exclusiveScope}} {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} - {{if .IsArchived}} - - {{$.locale.Tr "archived"}} - - {{end}} + {{if .IsArchived}} + + {{$.locale.Tr "archived"}} + + {{end}} {{end}}
    diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 8dad2e4685e77..e2039f10469e8 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -43,11 +43,11 @@ {{end}}
    - {{if .IsArchived}} + {{if .IsArchived}} - {{$.locale.Tr "archived"}} + {{$.locale.Tr "archived"}} - {{end}} + {{end}}
    {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} From 7b7a14039804a84d1977a8782227895f8676bcc1 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Fri, 1 Sep 2023 16:10:22 +0530 Subject: [PATCH 07/18] Linter --- templates/repo/issue/filters.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index 9aba7d0d7b652..d9495f52ef5ca 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -31,11 +31,11 @@ {{$previousExclusiveScope = $exclusiveScope}} {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} - {{if .IsArchived}} - - {{$.locale.Tr "archived"}} - - {{end}} + {{if .IsArchived}} + + {{$.locale.Tr "archived"}} + + {{end}} {{end}}
    From 8a6193d691f114008bbd2e2545d943f1d0cb3fec Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 4 Sep 2023 10:19:14 +0530 Subject: [PATCH 08/18] Removing all helper classes css Signed-off-by: puni9869 --- templates/repo/issue/filters.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 4 ++-- web_src/css/repo/issue-label.css | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index d9495f52ef5ca..b990b63faa489 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -32,7 +32,7 @@ {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} {{if .IsArchived}} - + {{$.locale.Tr "archived"}} {{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index e2039f10469e8..32133ba4e999c 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -44,7 +44,7 @@
    {{if .IsArchived}} - + {{$.locale.Tr "archived"}} {{end}} @@ -84,7 +84,7 @@
    {{if .IsArchived}} - + {{$.locale.Tr "archived"}} {{end}} diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index 9eda7828ed3d5..5e118cb363b61 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -48,4 +48,10 @@ height: fit-content; color: var(--color-text-light); background: var(--color-button); + font-size: 12px; + padding: 0.25rem; + border: 1px solid var(--color-secondary); + border-radius: var(--border-radius); + cursor: default; + justify-content: center; } From 3c993c36e740875966b17a217ae19d0c2a138e8c Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 4 Sep 2023 10:37:22 +0530 Subject: [PATCH 09/18] Fixing linter Signed-off-by: puni9869 --- templates/repo/issue/labels/label_list.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 32133ba4e999c..66510df5282b3 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -43,11 +43,11 @@ {{end}}
    - {{if .IsArchived}} + {{if .IsArchived}} - {{$.locale.Tr "archived"}} + {{$.locale.Tr "archived"}} - {{end}} + {{end}}
    {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} From bf2c9bacf2dbe5fd0f2d17c9250e25e9ba0320a7 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 12 Sep 2023 22:39:29 +0530 Subject: [PATCH 10/18] Adding archived template --- templates/repo/issue/labels/label_archived.tmpl | 5 +++++ templates/repo/issue/labels/label_list.tmpl | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 templates/repo/issue/labels/label_archived.tmpl diff --git a/templates/repo/issue/labels/label_archived.tmpl b/templates/repo/issue/labels/label_archived.tmpl new file mode 100644 index 0000000000000..6add8688febd8 --- /dev/null +++ b/templates/repo/issue/labels/label_archived.tmpl @@ -0,0 +1,5 @@ +{{if .IsArchived}} + + {{$.locale.Tr "archived"}} + +{{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 66510df5282b3..6353c3db5df7a 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -43,11 +43,7 @@ {{end}}
    - {{if .IsArchived}} - - {{$.locale.Tr "archived"}} - - {{end}} + {{template "repo/issue/labels/label_archived" .}}
    {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} From 0243ab759b18df5e3b17ca96573fd20b67396c14 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 12 Sep 2023 23:22:27 +0530 Subject: [PATCH 11/18] Adding archived template --- templates/repo/issue/labels/label_archived.tmpl | 4 ++-- templates/repo/issue/labels/label_list.tmpl | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/templates/repo/issue/labels/label_archived.tmpl b/templates/repo/issue/labels/label_archived.tmpl index 6add8688febd8..c13533965b5de 100644 --- a/templates/repo/issue/labels/label_archived.tmpl +++ b/templates/repo/issue/labels/label_archived.tmpl @@ -1,5 +1,5 @@ {{if .IsArchived}} - - {{$.locale.Tr "archived"}} + + {{ctx.Locale.Tr "archived"}} {{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 6353c3db5df7a..d9addb439b840 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -79,11 +79,7 @@ {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}
    - {{if .IsArchived}} - - {{$.locale.Tr "archived"}} - - {{end}} + {{template "repo/issue/labels/label_archived" .}}
    {{end}} From e3dd978815143d5cc2c666575606fe628014ae47 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 12 Sep 2023 23:45:36 +0530 Subject: [PATCH 12/18] Adding archived template --- templates/repo/issue/filters.tmpl | 6 +----- templates/repo/issue/labels/label_archived.tmpl | 2 +- web_src/css/repo/issue-label.css | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index b990b63faa489..3bfced90d6a0f 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -31,11 +31,7 @@ {{$previousExclusiveScope = $exclusiveScope}} {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} - {{if .IsArchived}} - - {{$.locale.Tr "archived"}} - - {{end}} +

    {{template "repo/issue/labels/label_archived" .}}

     {{end}}
    diff --git a/templates/repo/issue/labels/label_archived.tmpl b/templates/repo/issue/labels/label_archived.tmpl index c13533965b5de..40c0ed93e1810 100644 --- a/templates/repo/issue/labels/label_archived.tmpl +++ b/templates/repo/issue/labels/label_archived.tmpl @@ -1,5 +1,5 @@ {{if .IsArchived}} - + {{ctx.Locale.Tr "archived"}} {{end}} diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index 5e118cb363b61..a335f1c653149 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -55,3 +55,7 @@ cursor: default; justify-content: center; } + +.label-operation .archived { + +} From e538f73b5eaefebc3f42100bbaebc54655611109 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 12 Sep 2023 23:48:24 +0530 Subject: [PATCH 13/18] Linter fix in css --- web_src/css/repo/issue-label.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index a335f1c653149..5e118cb363b61 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -55,7 +55,3 @@ cursor: default; justify-content: center; } - -.label-operation .archived { - -} From 0d497af9691778bb810da4dab20e040e04637f6e Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 13 Sep 2023 12:44:57 +0530 Subject: [PATCH 14/18] Remove the extra styles --- web_src/css/repo/issue-label.css | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index 5e118cb363b61..8d96330b26df2 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -43,15 +43,8 @@ } .archived-label { - display: inline-flex; - width: fit-content; - height: fit-content; - color: var(--color-text-light); - background: var(--color-button); - font-size: 12px; - padding: 0.25rem; + font-size: 10px; + padding: 0.1rem; border: 1px solid var(--color-secondary); border-radius: var(--border-radius); - cursor: default; - justify-content: center; } From 3658703d9c6ab600bc29b40c5cbca28150832d69 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 13 Sep 2023 12:46:56 +0530 Subject: [PATCH 15/18] Adding height to archived box --- web_src/css/repo/issue-label.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index 8d96330b26df2..48fd259e461ba 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -43,6 +43,7 @@ } .archived-label { + height: fit-content; font-size: 10px; padding: 0.1rem; border: 1px solid var(--color-secondary); From 8687cffe5f2661152df0a4f244a5b59bcb15493b Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sat, 16 Sep 2023 12:35:16 +0530 Subject: [PATCH 16/18] Adding ui label basic mini Signed-off-by: puni9869 --- templates/repo/issue/labels/label_archived.tmpl | 2 +- web_src/css/repo/issue-label.css | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/labels/label_archived.tmpl b/templates/repo/issue/labels/label_archived.tmpl index 40c0ed93e1810..94e2fc35361fd 100644 --- a/templates/repo/issue/labels/label_archived.tmpl +++ b/templates/repo/issue/labels/label_archived.tmpl @@ -1,5 +1,5 @@ {{if .IsArchived}} - + {{ctx.Locale.Tr "archived"}} {{end}} diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index 48fd259e461ba..1f83e81d964e3 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -42,10 +42,6 @@ opacity: 0.7; } -.archived-label { +.label-operation .label { height: fit-content; - font-size: 10px; - padding: 0.1rem; - border: 1px solid var(--color-secondary); - border-radius: var(--border-radius); } From c9516ed6d71634292a7d6666c7f5f04cedb370f8 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sat, 16 Sep 2023 20:55:37 +0530 Subject: [PATCH 17/18] Trying to add similar style in issue label filter Signed-off-by: puni9869 --- templates/repo/issue/labels/label_archived.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/labels/label_archived.tmpl b/templates/repo/issue/labels/label_archived.tmpl index 94e2fc35361fd..feaf77e456c7d 100644 --- a/templates/repo/issue/labels/label_archived.tmpl +++ b/templates/repo/issue/labels/label_archived.tmpl @@ -1,5 +1,5 @@ {{if .IsArchived}} - + {{ctx.Locale.Tr "archived"}} {{end}} From 1e01b5865da9d3681b1c033ebe8afc837ed9c854 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 18 Sep 2023 01:22:14 +0200 Subject: [PATCH 18/18] override problematic style --- web_src/css/base.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index b41bfc6942a72..a3057013326ba 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1969,7 +1969,8 @@ a.ui.ui.ui.basic.primary.label:hover { } .ui.basic.labels .label, -.ui.basic.label { +.ui.basic.label, +.ui.secondary.labels .ui.basic.label { background: var(--color-button); border-color: var(--color-light-border); color: var(--color-text-light);