LoweBowe/libarea
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FIX: BuildTree

Browse source 
+ улучшение Ночной темы...
This commit is contained in:
Evg 2023-11-17 08:55:03 +03:00
parent 612b5ed1c9
commit 2e96b09e8d
5 changed files with 55 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/Services/Tree/BuildTree.php
View file

@ -13,17 +13,26 @@ class BuildTree
$grouped[$node[$type . '_parent_id']][] = $node;
}
$siblings = [];
$fnBuilder = function ($siblings) use (&$fnBuilder, $grouped, $type) {
foreach ($siblings as $k => $sibling) {
$id = $sibling[$type . '_id'];
if (isset($grouped[$id])) {
$sibling['children'] = $fnBuilder($grouped[$id]);
if ($siblings) {
foreach ($siblings as $k => $sibling) {
$id = $sibling[$type . '_id'];
if (isset($grouped[$id])) {
$sibling['children'] = $fnBuilder($grouped[$id]);
}
$siblings[$k] = $sibling;
}
$siblings[$k] = $sibling;
}
return $siblings;
};
return $fnBuilder($grouped[$group]);
if (isset($grouped[$group])) {
$tree = $fnBuilder($grouped[$group]);
} else {
$tree = [];
}
return $tree;
}
}

2
public/assets/css/light.css
View file

@ -1 +1 @@
body{background-color:var(--gray-100)}.box,.box-flex,.indent-body{background-color:var(--white)}.indent-body{padding:15px}ul.nav>li.active{background-color:var(--black);color:var(--white)}ul.nav>li.active>a{color:var(--white)}.user-nav li:hover,.menu li.active,.menu li:hover{background-color:var(--white)}.active{color:#eab308}.menu .active .icons{stroke:#eab308}.nickname{display:inline-block}.nickname::first-letter{color:red}
:root{--bg-color:#f3f4f6;--text-color:#111;--nav-bg-active:#fff;--nav-color-active:#4b5563}body.dark{--nav-bg-active:#161f27;--nav-color-active:#9ca3af}body{background-color:var(--bg-color)}.box,.box-flex,.indent-body{background-color:var(--white)}.indent-body{padding:15px}ul.nav>li.active{background-color:#111;color:#fff}body.dark ul.nav>li.active{background-color:var(--nav-bg-active);color:#fff}ul.nav>li.active>a{color:var(--nav-color-active)}.user-nav li:hover,.menu li.active,.menu li:hover{background-color:var(--nav-bg-active)}.active{color:#eab308}.menu .active .icons{stroke:#eab308}.nickname{display:inline-block}.nickname::first-letter{color:red}

2
public/assets/css/style.css
View file

File diff suppressed because one or more lines are too long

26
resources/views/default/css/theme/_variables-dark.css
View file

@ -4,7 +4,6 @@
* Тёмная (ночная) тема
*/
body.dark {
--bg-color: #202b38;
--text-color: #fff;
@ -25,26 +24,27 @@ body.dark {
--border-radius: 3px;
--button-text-color: #fff;
--button-bg-color: #0085ee;
--button-border-color: #0379d7;
--button-border-color-hover: #fff;
--button-text-color: #bfcad3;
--button-bg-color: #1e2226;
--button-border-color: #1e2226;
--button-border-color-hover: #ddd;
--button-outline-text-color: #0085ee;
--button-outline-bg-color: #fff;
--button-outline-border-color: #0379d7;
--button-outline-text-color-hover: #fff;
--button-outline-bg-color-hover: #0085ee;
--button-outline-border-color-hover: #0379d7;
--button-outline-text-color: #bfcad3;
--button-outline-bg-color: #3f4851;
--button-outline-border-color: #3f4851;
--header-bg: #040a0f;
--button-outline-text-color-hover: #bfcad3;
--button-outline-bg-color-hover: #555f6a;
--button-outline-border-color-hover: #555f6a;
--header-bg: #1a2630;
--header-box-shadow: 0 1px 2px -1px rgb(0 0 0 / 25%);
--header-text-color: #fff;
--header-logo-color: #fff;
--header-form-bg-color: #161f27;
--header-form-text-color: #fff;
--footer-bg: #040a0f;
--footer-bg: #1a2630;
--footer-box-shadow: 0 -5px 5px -5px rgb(0 0 0 / 15%);
--footer-text-color: #eee;
--footer-color-active: #ccc;

31
resources/views/light/css/custom.css
View file

@ -3,8 +3,21 @@
*
* Дополнительные стили
*/
body { background-color: var(--gray-100); }
:root {
--bg-color: #f3f4f6;
--text-color: #111;
--nav-bg-active: #fff;
--nav-color-active: #4b5563;
}
body.dark {
--nav-bg-active: #161f27;
--nav-color-active: #9ca3af;
}
body { background-color: var(--bg-color); }
.box,
.box-flex,
@ -13,13 +26,19 @@ body { background-color: var(--gray-100); }
.indent-body { padding: 15px; }
ul.nav > li.active {
background-color: var(--black);
color: var(--white);
background-color: #111;
color: #fff;
}
ul.nav > li.active > a { color: var(--white); }
body.dark ul.nav > li.active {
background-color: var(--nav-bg-active);
color: #fff;
}
.user-nav li:hover, .menu li.active, .menu li:hover { background-color: var(--white); }
ul.nav > li.active > a { color: var(--nav-color-active); }
.user-nav li:hover, .menu li.active, .menu li:hover { background-color: var(--nav-bg-active); }
.active { color: #eab308; }
.menu .active .icons { stroke: #eab308; }