diff --git a/src/config/app.php b/src/config/app.php --- a/src/config/app.php +++ b/src/config/app.php @@ -239,7 +239,7 @@ 'email' => env('COMPANY_EMAIL'), 'logo' => env('COMPANY_LOGO'), 'footer' => env('COMPANY_FOOTER', env('COMPANY_DETAILS')), - 'copyright' => env('COMPANY_COPYRIGHT', env('COMPANY_NAME', 'Apheleia IT AG')), + 'copyright' => 'Apheleia IT AG', ], 'storage' => [ diff --git a/src/resources/themes/default/images/favicon.ico b/src/resources/themes/default/images/favicon.ico index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ - -
-

@lang('theme::support.title')

-

- @lang('theme::support.text1') -
-
- @lang('theme::support.text2', ['site' => config('app.name')]) -

+

@lang('theme::support.documentation')

+

+ @lang('theme::support.doc1') +

+ @lang('theme::support.doc2') +

- @lang('theme::support.title') + @lang('theme::support.search-kb')
diff --git a/src/resources/themes/default/theme.json b/src/resources/themes/default/theme.json --- a/src/resources/themes/default/theme.json +++ b/src/resources/themes/default/theme.json @@ -1,46 +1,16 @@ { "menu": [ { - "label": "explore", - "location": "https://kolabnow.com/", - "admin": true, - "reseller": true - }, - { - "label": "blog", - "location": "https://blogs.kolabnow.com/", - "admin": true, - "reseller": true - }, - { "label": "support", "location": "/support", "page": "support", "admin": true, "reseller": true - }, - { - "label": "tos", - "location": "https://kolabnow.com/tos", - "footer": true, - "reseller": true } ], "faq": { "signup": [ { - "href": "https://kolabnow.com/tos", - "label": "tos" - }, - { - "href": "https://kb.kolabnow.com/faq/can-i-upgrade-an-individual-account-to-a-group-account", - "label": "account-upgrade" - }, - { - "href": "https://kb.kolabnow.com/faq/how-much-storage-comes-with-my-account", - "label": "storage" - }, - { "href": "/support", "label": "support" } diff --git a/src/resources/themes/variables.scss b/src/resources/themes/variables.scss --- a/src/resources/themes/variables.scss +++ b/src/resources/themes/variables.scss @@ -6,10 +6,17 @@ $font-size-base: 0.9rem; $line-height-base: 1.5; -$main-color: #007bff; +// Colors +$kolab-blue: #65c2ee; +$light: #f6f5f3; + +$main-color: $kolab-blue; // App colors -$menu-bg-color: #f8f9fa; +$menu-bg-color: $light; $menu-footer-color: #fff; $menu-footer-bg-color: #aaa; $menu-gray: #575656; + +$table-hover-bg: $menu-bg-color; +$table-head-bg: $menu-bg-color; diff --git a/src/tests/Browser/Admin/LogonTest.php b/src/tests/Browser/Admin/LogonTest.php --- a/src/tests/Browser/Admin/LogonTest.php +++ b/src/tests/Browser/Admin/LogonTest.php @@ -29,7 +29,7 @@ $this->browse(function (Browser $browser) { $browser->visit(new Home()) ->with(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['support', 'login', 'lang']); }) ->assertMissing('@second-factor-input') ->assertMissing('@forgot-password'); @@ -77,7 +77,7 @@ // Checks if we're really on Dashboard page $browser->on(new Dashboard()) ->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout', 'lang']); + $browser->assertMenuItems(['support', 'dashboard', 'logout', 'lang']); }) ->assertUser('jeroen@jeroen.jeroen'); @@ -108,7 +108,7 @@ // with default menu $browser->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['support', 'login', 'lang']); }); // Success toast message @@ -135,7 +135,7 @@ // with default menu $browser->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['support', 'login', 'lang']); }); // Success toast message diff --git a/src/tests/Browser/FaqTest.php b/src/tests/Browser/FaqTest.php --- a/src/tests/Browser/FaqTest.php +++ b/src/tests/Browser/FaqTest.php @@ -17,7 +17,7 @@ $browser->visit(new Signup()) ->whenAvailable('#faq', function ($browser) { $browser->assertSeeIn('h5', 'FAQ') - ->assertElementsCount('ul > li', 4) + ->assertElementsCount('ul > li', 1) ->assertSeeIn('li:last-child a', 'Need support?') ->click('li:last-child a'); }) diff --git a/src/tests/Browser/LogonTest.php b/src/tests/Browser/LogonTest.php --- a/src/tests/Browser/LogonTest.php +++ b/src/tests/Browser/LogonTest.php @@ -21,14 +21,14 @@ $this->browse(function (Browser $browser) { $browser->visit(new Home()) ->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login', 'lang']) + $browser->assertMenuItems(['signup', 'support', 'login', 'lang']) ->assertSeeIn('#footer-copyright', \config('app.company.copyright')) ->assertSeeIn('#footer-copyright', date('Y')); }); if ($browser->isDesktop()) { $browser->within(new Menu('footer'), function ($browser) { - $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'login']); + $browser->assertMenuItems(['signup', 'support', 'login']); }); } else { $browser->assertMissing('#footer-menu .navbar-nav'); @@ -139,12 +139,12 @@ ->assertVisible('@links a.link-wallet') ->assertVisible('@links a.link-webmail') ->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout', 'lang']); + $browser->assertMenuItems(['support', 'dashboard', 'logout', 'lang']); }); if ($browser->isDesktop()) { $browser->within(new Menu('footer'), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'tos', 'dashboard', 'logout']); + $browser->assertMenuItems(['support', 'dashboard', 'logout']); }); } else { $browser->assertMissing('#footer-menu .navbar-nav'); @@ -191,7 +191,7 @@ // with default menu $browser->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['signup', 'support', 'login', 'lang']); }); // Success toast message @@ -218,7 +218,7 @@ // with default menu $browser->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['signup', 'support', 'login', 'lang']); }); // Success toast message diff --git a/src/tests/Browser/Reseller/LogonTest.php b/src/tests/Browser/Reseller/LogonTest.php --- a/src/tests/Browser/Reseller/LogonTest.php +++ b/src/tests/Browser/Reseller/LogonTest.php @@ -28,7 +28,7 @@ $this->browse(function (Browser $browser) { $browser->visit(new Home()) ->with(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['support', 'login', 'lang']); }) ->assertMissing('@second-factor-input') ->assertMissing('@forgot-password'); @@ -76,7 +76,7 @@ // Checks if we're really on Dashboard page $browser->on(new Dashboard()) ->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout', 'lang']); + $browser->assertMenuItems(['support', 'dashboard', 'logout', 'lang']); }) ->assertUser('reseller@' . \config('app.domain')); @@ -107,7 +107,7 @@ // with default menu $browser->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['support', 'login', 'lang']); }); // Success toast message @@ -134,7 +134,7 @@ // with default menu $browser->within(new Menu(), function ($browser) { - $browser->assertMenuItems(['explore', 'blog', 'support', 'login', 'lang']); + $browser->assertMenuItems(['support', 'login', 'lang']); }); // Success toast message