From a590560031b3a0fb8267ce0b14f13df508bfc6ea Mon Sep 17 00:00:00 2001 From: CirnoT <1447794+CirnoT@users.noreply.github.com> Date: Sat, 23 May 2020 02:40:52 +0200 Subject: [PATCH 1/5] Make tabular menu styling consistent for arc-green --- web_src/less/themes/theme-arc-green.less | 36 +++++++++++++----------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index a79bbe1ec5b2e..fd136a5fb21c9 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -385,22 +385,6 @@ a.ui.basic.green.label:hover { background-color: #2a2e3a; } -.ui.tabular.menu .active.item { - background: #383c4a; - color: #dbdbdb; - border-left: 1px solid transparent; - border-right: 1px solid transparent; - border-top: 0; -} - -.ui.tabular.menu .item { - color: #9e9e9e; -} - -.ui.tabular.menu .item:hover { - color: #dbdbdb; -} - .ui.header, .ui.breadcrumb .divider { color: #9e9e9e; @@ -531,7 +515,25 @@ a.ui.basic.green.label:hover { border-bottom: 1px solid #304251; } -.repository.wiki.new .ui.container form .ui.tabular.menu { +.ui.tabular.menu { + .active.item { + background: #383c4a; + color: #dbdbdb; + border-left: 1px solid transparent; + border-right: 1px solid transparent; + border-top: 0; + } + + .item { + color: #9e9e9e; + } + + .item:hover { + color: #dbdbdb; + } +} + +.ui.container form .ui.tabular.menu { border-bottom: 1px solid rgba(187, 187, 187, .6); .active.item { From c878f80421d35a93c2a87340119d81b9cf475c53 Mon Sep 17 00:00:00 2001 From: CirnoT <1447794+CirnoT@users.noreply.github.com> Date: Sat, 23 May 2020 03:38:52 +0200 Subject: [PATCH 2/5] rework completely --- web_src/less/themes/theme-arc-green.less | 32 ++++++++++-------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index fd136a5fb21c9..b2560aeb15628 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -516,12 +516,14 @@ a.ui.basic.green.label:hover { } .ui.tabular.menu { - .active.item { - background: #383c4a; + border-bottom: 1px solid rgba(187, 187, 187, .6); + + .item.active { + border-top: 1px solid rgba(187, 187, 187, .6); + border-left: 1px solid rgba(187, 187, 187, .6); + border-right: 1px solid rgba(187, 187, 187, .6); + background: #4b5162; color: #dbdbdb; - border-left: 1px solid transparent; - border-right: 1px solid transparent; - border-top: 0; } .item { @@ -531,17 +533,13 @@ a.ui.basic.green.label:hover { .item:hover { color: #dbdbdb; } -} - -.ui.container form .ui.tabular.menu { - border-bottom: 1px solid rgba(187, 187, 187, .6); - .active.item { - border-top: 1px solid rgba(187, 187, 187, .6); - border-left: 1px solid rgba(187, 187, 187, .6); - border-right: 1px solid rgba(187, 187, 187, .6); - &:hover { - background: #4b5162; + &.navbar { + .item.active { + background: #383c4a; + border-left: 1px solid transparent; + border-right: 1px solid transparent; + border-top: 0; } } } @@ -826,10 +824,6 @@ a.ui.basic.green.label:hover { color: #dbdbdb !important; } -.ui.tabular.menu { - border-bottom: 1px solid #313c47; -} - .ui.card, .ui.cards > .card { background: #353945; From e14ca052d32c2dae0e570927de31f47dea030501 Mon Sep 17 00:00:00 2001 From: CirnoT <1447794+CirnoT@users.noreply.github.com> Date: Sat, 23 May 2020 03:47:37 +0200 Subject: [PATCH 3/5] transparent borders --- web_src/less/themes/theme-arc-green.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index b2560aeb15628..a0b0d9a2ed9ef 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -516,12 +516,12 @@ a.ui.basic.green.label:hover { } .ui.tabular.menu { - border-bottom: 1px solid rgba(187, 187, 187, .6); + border-bottom: 1px solid rgba(187, 187, 187, .24); .item.active { - border-top: 1px solid rgba(187, 187, 187, .6); - border-left: 1px solid rgba(187, 187, 187, .6); - border-right: 1px solid rgba(187, 187, 187, .6); + border-top: 1px solid transparent; + border-left: 1px solid transparent; + border-right: 1px solid transparent; background: #4b5162; color: #dbdbdb; } From 2a7641c3be2e9235c72462e65e1740d3a784fe59 Mon Sep 17 00:00:00 2001 From: CirnoT <1447794+CirnoT@users.noreply.github.com> Date: Sat, 23 May 2020 16:30:49 +0200 Subject: [PATCH 4/5] use darker color for active item; override only colors for borders --- web_src/less/themes/theme-arc-green.less | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index a0b0d9a2ed9ef..6df03bddb41db 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -516,13 +516,13 @@ a.ui.basic.green.label:hover { } .ui.tabular.menu { - border-bottom: 1px solid rgba(187, 187, 187, .24); + border-bottom-color: rgba(187, 187, 187, .24); .item.active { - border-top: 1px solid transparent; - border-left: 1px solid transparent; - border-right: 1px solid transparent; - background: #4b5162; + border-top-color: transparent; + border-left-color: transparent; + border-right-color: transparent; + background: #404552; color: #dbdbdb; } @@ -537,8 +537,8 @@ a.ui.basic.green.label:hover { &.navbar { .item.active { background: #383c4a; - border-left: 1px solid transparent; - border-right: 1px solid transparent; + border-left-color: transparent; + border-right-color: transparent; border-top: 0; } } From 6fea9c84110c0edbfdfd496600fe8594f38b146c Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Sun, 24 May 2020 23:57:06 +0200 Subject: [PATCH 5/5] Update web_src/less/themes/theme-arc-green.less Co-authored-by: silverwind --- web_src/less/themes/theme-arc-green.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 6df03bddb41db..0ac6a1804b6e2 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -539,7 +539,7 @@ a.ui.basic.green.label:hover { background: #383c4a; border-left-color: transparent; border-right-color: transparent; - border-top: 0; + border-top: none; } } }