Skip to content

Commit

Permalink
Merge pull request #66 from lara-zeus/updates-dep
Browse files Browse the repository at this point in the history
update them all
  • Loading branch information
atmonshi authored Sep 12, 2023
2 parents 08c98bb + eac3670 commit 7c9b066
Show file tree
Hide file tree
Showing 10 changed files with 218 additions and 217 deletions.
393 changes: 196 additions & 197 deletions composer.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions config/zeus.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@
* this will be setup the default seo site color theme. read more about it in 'laravel-seo'.
*/
'site_color' => '#F5F5F4',

/** set the default menu to use in header nav */
'header_menu' => 'main-header-menu',
];
2 changes: 1 addition & 1 deletion resources/dist/filament-tail.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/frontend.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/lara-zeus.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/dist/frontend.css": "/dist/frontend.css?id=effaa79c25869cae9b774fd34336860d",
"/dist/filament-tail.css": "/dist/filament-tail.css?id=ae8207b4d69dda20023f60b4380ef2cc"
"/dist/frontend.css": "/dist/frontend.css?id=8a3f4409f49c6028122858272d106632",
"/dist/filament-tail.css": "/dist/filament-tail.css?id=3047e373f768628d26ffa8323ad07467"
}
15 changes: 8 additions & 7 deletions src/CoreServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ public function packageBooted(): void
'rain',
'rhea',
'artemis',
]);
AboutCommand::add('Zeus', fn () => [
'Core Version' => InstalledVersions::getPrettyVersion('lara-zeus/core'),
'Packages' => $packages
->filter(fn (string $package): bool => InstalledVersions::isInstalled("lara-zeus/{$package}"))
->join(', '),
]);
'hermes',
'tyche',
])
->filter(fn (string $package): bool => InstalledVersions::isInstalled("lara-zeus/{$package}"))
->mapWithKeys(fn ($package) => [$package => InstalledVersions::getPrettyVersion("lara-zeus/{$package}")])
->toArray();

AboutCommand::add('Zeus ', $packages);
}
// let me have my fun 🤷🏽‍
Blade::directive('zeus', function () {
Expand Down
6 changes: 3 additions & 3 deletions tailwind-filament.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ module.exports = {
extend: {
colors: {
gray: colors.stone,
primary: colors.emerald,
custom: colors.emerald,
secondary: colors.yellow,
primary: { DEFAULT: '#45B39D', 50: '#C6E9E2', 100: '#B8E4DB', 200: '#9AD8CC', 300: '#7DCDBD', 400: '#5FC1AE', 500: '#45B39D', 600: '#358B79', 700: '#266256', 800: '#163A32', 900: '#07110F', 950: '#000000'},
custom: { DEFAULT: '#45B39D', 50: '#C6E9E2', 100: '#B8E4DB', 200: '#9AD8CC', 300: '#7DCDBD', 400: '#5FC1AE', 500: '#45B39D', 600: '#358B79', 700: '#266256', 800: '#163A32', 900: '#07110F', 950: '#000000'},
secondary: { DEFAULT: '#F1948A', 50: '#FDF2F0', 100: '#FCE7E5', 200: '#F9D2CE', 300: '#F6BEB8', 400: '#F4A9A1', 500: '#F1948A', 600: '#EB6658', 700: '#E53826', 800: '#BC2717', 900: '#8A1C11', 950: '#71170E'},
danger: colors.rose,
success: colors.green,
warning: colors.yellow,
Expand Down
6 changes: 3 additions & 3 deletions tailwind-frontend.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ module.exports = {
extend: {
colors: {
gray: colors.stone,
primary: colors.emerald,
custom: colors.emerald,
secondary: colors.yellow,
primary: { DEFAULT: '#45B39D', 50: '#C6E9E2', 100: '#B8E4DB', 200: '#9AD8CC', 300: '#7DCDBD', 400: '#5FC1AE', 500: '#45B39D', 600: '#358B79', 700: '#266256', 800: '#163A32', 900: '#07110F', 950: '#000000'},
custom: { DEFAULT: '#45B39D', 50: '#C6E9E2', 100: '#B8E4DB', 200: '#9AD8CC', 300: '#7DCDBD', 400: '#5FC1AE', 500: '#45B39D', 600: '#358B79', 700: '#266256', 800: '#163A32', 900: '#07110F', 950: '#000000'},
secondary: { DEFAULT: '#F1948A', 50: '#FDF2F0', 100: '#FCE7E5', 200: '#F9D2CE', 300: '#F6BEB8', 400: '#F4A9A1', 500: '#F1948A', 600: '#EB6658', 700: '#E53826', 800: '#BC2717', 900: '#8A1C11', 950: '#71170E'},
danger: colors.rose,
success: colors.green,
warning: colors.yellow,
Expand Down
2 changes: 0 additions & 2 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@ if (mix.inProduction()) {
mix.copy('resources/dist', '../demo/public/css/lara-zeus')
mix.copy('resources/dist', '../demo/public/vendor/zeus')
mix.copy('resources/dist', '../zeus/public/vendor/zeus')
mix.copy('resources/dist', '../v3/public/vendor/zeus')
mix.copy('resources/dist', '../v3/public/css/lara-zeus')
}

0 comments on commit 7c9b066

Please sign in to comment.