From: Dan Brown Date: Sat, 28 Jan 2023 17:49:48 +0000 (+0000) Subject: Updated migration to carry across more colors, updated export X-Git-Tag: v23.01~1^2~2^2~1 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7751022c66134877eab405c6bb77ad92a4221523?ds=sidebyside Updated migration to carry across more colors, updated export Updated export to use link color for link. Export will now copy primary color to link color options for stable upgrades. --- diff --git a/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php b/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php index b72b16162..eb779fc7b 100644 --- a/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php +++ b/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php @@ -31,6 +31,13 @@ class CopyColorSettingsForDarkMode extends Migration $newSetting = (array) $setting; $newSetting['setting_key'] .= '-dark'; $newData[] = $newSetting; + + if ($newSetting['setting_key'] === 'app-color-dark') { + $newSetting['setting_key'] = 'link-color'; + $newData[] = $newSetting; + $newSetting['setting_key'] = 'link-color-dark'; + $newData[] = $newSetting; + } } DB::table('settings')->insert($newData); @@ -45,6 +52,8 @@ class CopyColorSettingsForDarkMode extends Migration { $colorSettings = [ 'app-color-dark', + 'link-color', + 'link-color-dark', 'app-color-light-dark', 'bookshelf-color-dark', 'book-color-dark', diff --git a/resources/views/exports/parts/styles.blade.php b/resources/views/exports/parts/styles.blade.php index 830b8e49a..f570ff512 100644 --- a/resources/views/exports/parts/styles.blade.php +++ b/resources/views/exports/parts/styles.blade.php @@ -10,7 +10,7 @@