From 382320c1ffea18f63e884691bec95d6cac34fa39 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Thu, 15 Jun 2023 01:26:25 +0530 Subject: [PATCH 01/11] Empty-Commit From 496e352c87d729d0e73321b27c4106dd16209dde Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 11:48:48 +0530 Subject: [PATCH 02/11] Fixing the mobile view port for issue-list menu and dropdown. --- templates/repo/issue/list.tmpl | 7 ++-- web_src/css/repo/issue-list.css | 66 ++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 3323bf893e047..cb9832acbee3b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -81,14 +81,15 @@ {{end}} {{end}} -
-
+
+
+
{{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}} {{end}} {{template "repo/issue/openclose" .}}
-
+
diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index dde3e7f19f812..41fb94714296b 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,15 +1,61 @@ -.issue-list-toolbar { - display: flex; - flex-wrap: wrap; - align-items: flex-start; - gap: 1rem; - margin-top: 1rem; +@media only screen and (min-width: 1024px) and (max-width: 1266px){ + #issue-filters > .column.six.wide.column { + max-width: fit-content; + } + + #issue-filters > .issue-list-toolbar-right > .stackable.menu { + margin-left: calc(33% - 7vw); + } +} + +@media only screen and (min-width: 1266px) { + #issue-filters > .issue-list-toolbar-right > .stackable.menu { + margin-left: 16vh; + } } -.issue-list-toolbar-left { - display: flex; +@media only screen and (max-width: 767.98px) { + .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right > .stackable.menu { + overflow-y: hidden; + overflow-x: scroll; + flex-direction: row !important; + flex-wrap: nowrap !important; + } + + .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right > .stackable.menu > .item { + max-width: fit-content; + } + + .ui.stackable.menu:not(.no-vertical-tabs) > .dropdown.item { + position: initial; + } + + .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right { + padding-top: 0; + } } -.issue-list-toolbar-right { - margin-left: auto; +@media only screen and (min-width: 767.98px) and (max-width: 1024px) { + .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right > .stackable.menu { + flex-wrap: nowrap !important; + } + + .ui.grid > .column.six.wide.column { + flex: 1; + max-width: fit-content; + display: flex; + } + + #issue-filters { + flex-direction: column; + } + + .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right { + padding-top: 0; + padding-left: 3px; + } + + #issue-filters > .issue-list-toolbar-right > .stackable.menu { + margin-left: 0; + } } From 490f56bec14a7ef4a46c5c7f3f85ec1899bc8910 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 11:52:06 +0530 Subject: [PATCH 03/11] Setting margins for large device screen for issue filter --- web_src/css/repo/issue-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 41fb94714296b..58b46511aa1a6 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -10,7 +10,7 @@ @media only screen and (min-width: 1266px) { #issue-filters > .issue-list-toolbar-right > .stackable.menu { - margin-left: 16vh; + margin-left: 14vh; } } From 44d18669e394e395ad813bb33b675fd1719a30f3 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 11:54:53 +0530 Subject: [PATCH 04/11] Linter --- web_src/css/repo/issue-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 58b46511aa1a6..bee5a8d47d79c 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,4 +1,4 @@ -@media only screen and (min-width: 1024px) and (max-width: 1266px){ +@media only screen and (min-width: 1024px) and (max-width: 1266px) { #issue-filters > .column.six.wide.column { max-width: fit-content; } From 91c35d6650ac7c35b84e56f018473ec52967e9b3 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 18:22:35 +0530 Subject: [PATCH 05/11] Removing div divider and fixing view port resolution with suggestion --- templates/repo/issue/list.tmpl | 5 +- web_src/css/repo/issue-list.css | 89 +++++++++++++-------------------- 2 files changed, 38 insertions(+), 56 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index ec05f9ba16933..e5376decbf6b3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -81,16 +81,15 @@ {{end}} {{end}}
-
-
+
{{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}} {{end}} {{template "repo/issue/openclose" .}}
-
+
diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index d7e630a34675d..66c649d406fd5 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,81 +1,64 @@ -@media only screen and (min-width: 1024px) and (max-width: 1266px) { - #issue-filters > .column.six.wide.column { - max-width: fit-content; +@media only screen and (min-width: 1200px) { + #issue-filters { + margin-top: 0; + margin-left: auto; } - #issue-filters > .issue-list-toolbar-right > .stackable.menu { - margin-left: calc(33% - 7vw); + #issue-filters > .issue-list-toolbar-right > .issues-menu { + justify-content: flex-end; } -} -@media only screen and (min-width: 1266px) { - #issue-filters > .issue-list-toolbar-right > .stackable.menu { - margin-left: 14vh; + #issue-filters > .issue-list-toolbar-left { + padding-left: 0; } } -@media only screen and (max-width: 767.98px) { - .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right > .stackable.menu { - overflow-y: hidden; - overflow-x: scroll; - flex-direction: row !important; - flex-wrap: nowrap !important; - } +@media only screen and (max-width: 769px) { + #issue-filters > .issue-list-toolbar-right { + margin-right: auto; + width: 100% !important; + padding-top: 0; - .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right > .stackable.menu > .item { - max-width: fit-content; } - .ui.stackable.menu:not(.no-vertical-tabs) > .dropdown.item { - position: initial; + #issue-filters > .issue-list-toolbar-right > .issues-menu { + flex-direction: row; + overflow-x: scroll; } - .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right { - padding-top: 0; + #issue-filters > .issue-list-toolbar-right > .issues-menu > .item { + max-width: fit-content; } -} -@media only screen and (min-width: 767.98px) and (max-width: 1024px) { - .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right > .stackable.menu { - flex-wrap: nowrap !important; + #issue-filters > .issue-list-toolbar-left { + margin-top: 10px !important; } - .ui.grid > .column.six.wide.column { - flex: 1; - max-width: fit-content; - display: flex; + .ui.stackable.menu:not(.no-vertical-tabs) > .dropdown.item { + position: initial; } +} +@media only screen and (min-width: 768px) and (max-width: 1024px) { #issue-filters { flex-direction: column; + margin-top: 0; } - .ui.container > .ui.stackable.grid > .column.issue-list-toolbar-right { - padding-top: 0; - padding-left: 3px; - } - - #issue-filters > .issue-list-toolbar-right > .stackable.menu { - margin-left: 0; + #issue-filters > .issue-list-toolbar-right { + margin-top: 0; + padding: 0 1rem; } } -@media (max-width: 767.98px) { - .issue-list-toolbar { - flex-direction: column-reverse; - } - .issue-list-toolbar-right { - margin-right: auto; - width: 100%; - } - .issue-list-navbar { - order: 0; - } - .issue-list-new { - order: 1; - margin-left: auto !important; +@media only screen and (min-width: 1024px) and (max-width: 1200px) { + #issue-filters { + flex-direction: column; + margin-top: 0; } - .issue-list-search { - order: 2 !important; + + #issue-filters > .issue-list-toolbar-right { + margin-top: 0; + padding: 0 1rem; } } From 7d97d82b82e17bb72890f5e0273dae87c79529ce Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 19:52:05 +0530 Subject: [PATCH 06/11] Fixing:: Suggestions --- templates/repo/issue/list.tmpl | 4 ++-- web_src/css/repo/issue-list.css | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index e5376decbf6b3..7237ab244f631 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -81,7 +81,7 @@ {{end}} {{end}}
-
+
{{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}} @@ -89,7 +89,7 @@ {{template "repo/issue/openclose" .}}
-
+
diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 66c649d406fd5..cec87461b19be 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -4,7 +4,7 @@ margin-left: auto; } - #issue-filters > .issue-list-toolbar-right > .issues-menu { + .issue-list-toolbar-right > .filter.menu { justify-content: flex-end; } @@ -21,12 +21,12 @@ } - #issue-filters > .issue-list-toolbar-right > .issues-menu { + .issue-list-toolbar-right > .filter.menu { flex-direction: row; overflow-x: scroll; } - #issue-filters > .issue-list-toolbar-right > .issues-menu > .item { + .issue-list-toolbar-right > .filter.menu > .item { max-width: fit-content; } @@ -34,7 +34,7 @@ margin-top: 10px !important; } - .ui.stackable.menu:not(.no-vertical-tabs) > .dropdown.item { + .ui.stackable.menu > .dropdown.item { position: initial; } } From c54a073644473149cbb4e2375cb98ee09e8a2e53 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 20:08:30 +0530 Subject: [PATCH 07/11] Removed extra classes --- templates/repo/issue/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 7237ab244f631..ab8847e44872b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -88,7 +88,7 @@ {{end}} {{template "repo/issue/openclose" .}}
-
+
From ad8c1fd6d752a10b3259c3e3ab3afb3b1362bc76 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 18 Jun 2023 20:32:55 +0530 Subject: [PATCH 08/11] Fixing the checkbox problem --- web_src/css/repo/issue-list.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index cec87461b19be..f6df9cf5e4590 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,7 +1,13 @@ +#issue-filters > .issue-list-toolbar-left { + flex-direction: row; + display: flex; +} + @media only screen and (min-width: 1200px) { #issue-filters { margin-top: 0; margin-left: auto; + padding-right: 0; } .issue-list-toolbar-right > .filter.menu { @@ -14,11 +20,14 @@ } @media only screen and (max-width: 769px) { + #issue-filters { + margin-right: 0; + } + #issue-filters > .issue-list-toolbar-right { margin-right: auto; width: 100% !important; padding-top: 0; - } .issue-list-toolbar-right > .filter.menu { From 82bfd8b33776dec7a46dbb8991eb5373b989bbb0 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 19 Jun 2023 00:06:04 +0530 Subject: [PATCH 09/11] Fixing the checkbox problem and item-actions --- templates/repo/issue/list.tmpl | 10 +++--- web_src/css/repo/issue-list.css | 58 +++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index ab8847e44872b..11aee04d5c450 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -272,18 +272,18 @@
-
-
+
+
{{template "repo/issue/openclose" .}}
-
+
{{if not .Repository.IsArchived}} {{if .IsShowClosed}} - + {{else}} - + {{end}}
diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index f6df9cf5e4590..99b756248632b 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,8 +1,13 @@ -#issue-filters > .issue-list-toolbar-left { +#issue-filters > .issue-list-toolbar-left, +#issue-actions > .issue-list-toolbar-left { flex-direction: row; display: flex; } +#issue-actions { + margin-top: 0; +} + @media only screen and (min-width: 1200px) { #issue-filters { margin-top: 0; @@ -40,12 +45,48 @@ } #issue-filters > .issue-list-toolbar-left { - margin-top: 10px !important; + margin-top: 14px !important; } .ui.stackable.menu > .dropdown.item { position: initial; } + + .issue-list-toolbar { + flex-direction: column-reverse; + } + + .issue-list-toolbar-right { + margin-right: auto; + width: 100%; + } + + .issue-list-navbar { + order: 0; + } + + .issue-list-new { + order: 1; + margin-left: auto !important; + } + + .issue-list-search { + order: 2 !important; + } + + #issue-actions { + flex-direction: column; + margin-right: 0; + } + + #issue-actions > .issue-list-toolbar-right { + width: 100% !important; + padding-top: 0 !important; + } + + #issue-actions > .issue-list-toolbar-right > .filter.menu { + padding-left: .5rem; + } } @media only screen and (min-width: 768px) and (max-width: 1024px) { @@ -58,6 +99,14 @@ margin-top: 0; padding: 0 1rem; } + + #issue-actions { + justify-content: flex-end; + } + + #issue-actions > .issue-list-toolbar-right .filter.menu { + justify-content: flex-end; + } } @media only screen and (min-width: 1024px) and (max-width: 1200px) { @@ -70,4 +119,9 @@ margin-top: 0; padding: 0 1rem; } + + #issue-actions > .issue-list-toolbar-right { + display: flex; + justify-content: flex-end; + } } From c8b052553786cc09aa86aa0293eafb64fd115611 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 19 Jun 2023 12:27:02 +0530 Subject: [PATCH 10/11] Adding space to left side of drop down menu --- web_src/css/repo/issue-list.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 99b756248632b..2eab3472994d0 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -82,11 +82,17 @@ #issue-actions > .issue-list-toolbar-right { width: 100% !important; padding-top: 0 !important; + padding-bottom: 0; } #issue-actions > .issue-list-toolbar-right > .filter.menu { padding-left: .5rem; } + + .repository .filter.menu .ui.dropdown.label-filter .menu, + .repository .filter.menu .ui.dropdown .menu { + left: 8px; + } } @media only screen and (min-width: 768px) and (max-width: 1024px) { From 5d5192b639cf8d14aaa363d53732fa276f988c24 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 19 Jun 2023 14:11:39 +0530 Subject: [PATCH 11/11] Modifying delete button ml-auto style --- templates/repo/issue/list.tmpl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 6887e23b6c2de..2f87485065e81 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -287,10 +287,7 @@ {{end}} {{if $.IsRepoAdmin}} - + {{end}}