From e430dad38c48d4e971e7f985294b42d18d173da3 Mon Sep 17 00:00:00 2001 From: Nooto <50425610+NootoNooto@users.noreply.github.com> Date: Wed, 8 May 2019 23:05:30 +0200 Subject: [PATCH 01/12] Added translations for View All, Copy, Reply, etc --- resources/lang/nl/common.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/lang/nl/common.php b/resources/lang/nl/common.php index fdfb90fb2..49545cb1b 100644 --- a/resources/lang/nl/common.php +++ b/resources/lang/nl/common.php @@ -25,11 +25,14 @@ return [ */ 'actions' => 'Acties', 'view' => 'Bekijk', + 'view_all' => 'Bekijk alle', 'create' => 'Aanmaken', 'update' => 'Update', 'edit' => 'Bewerk', 'sort' => 'Sorteer', 'move' => 'Verplaats', + 'copy' => 'Kopiëren', + 'reply' => 'Beantwoorden', 'delete' => 'Verwijder', 'search' => 'Zoek', 'search_clear' => 'Zoekopdracht wissen', @@ -37,6 +40,11 @@ return [ 'remove' => 'Verwijderen', 'add' => 'Toevoegen', + // Sort Options + 'sort_name' => 'Naam', + 'sort_created_at' => 'Aanmaakdatum', + 'sort_updated_at' => 'Gewijzigd op', + /** * Misc */ @@ -58,4 +66,4 @@ return [ */ 'email_action_help' => 'Als je de knop ":actionText" niet werkt, kopieer en plak de onderstaande URL in je web browser:', 'email_rights' => 'Alle rechten voorbehouden', -]; \ No newline at end of file +]; From e00c170d85760ffc8ee52188bf634074641fced9 Mon Sep 17 00:00:00 2001 From: Nooto <50425610+NootoNooto@users.noreply.github.com> Date: Wed, 8 May 2019 23:24:22 +0200 Subject: [PATCH 02/12] Update common.php --- resources/lang/nl/common.php | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/resources/lang/nl/common.php b/resources/lang/nl/common.php index 49545cb1b..d44bd514d 100644 --- a/resources/lang/nl/common.php +++ b/resources/lang/nl/common.php @@ -1,31 +1,28 @@ 'Annuleren', 'confirm' => 'Bevestigen', 'back' => 'Terug', 'save' => 'Opslaan', 'continue' => 'Doorgaan', 'select' => 'Kies', + 'toggle_all' => 'Toggle Alles', 'more' => 'Meer', - - /** - * Form Labels - */ + + // Form Labels 'name' => 'Naam', 'description' => 'Beschrijving', 'role' => 'Rol', 'cover_image' => 'Omslagfoto', 'cover_image_description' => 'Deze afbeelding moet ongeveer 300x170px zijn.', - /** - * Actions - */ + + // Actions 'actions' => 'Acties', 'view' => 'Bekijk', - 'view_all' => 'Bekijk alle', + 'view_all' => 'Bekijk Alle', 'create' => 'Aanmaken', 'update' => 'Update', 'edit' => 'Bewerk', @@ -40,20 +37,22 @@ return [ 'remove' => 'Verwijderen', 'add' => 'Toevoegen', - // Sort Options + // Sort Options 'sort_name' => 'Naam', 'sort_created_at' => 'Aanmaakdatum', 'sort_updated_at' => 'Gewijzigd op', - /** - * Misc - */ + // Misc 'deleted_user' => 'Verwijderde gebruiker', 'no_activity' => 'Geen activiteiten', 'no_items' => 'Geen items beschikbaar', 'back_to_top' => 'Terug naar boven', 'toggle_details' => 'Details Weergeven', 'toggle_thumbnails' => 'Thumbnails Weergeven', + 'details' => 'Details', + 'grid_view' => 'Grid weergave', + 'list_view' => 'Lijst weergave', + 'default' => 'Standaard', /** * Header @@ -61,6 +60,10 @@ return [ 'view_profile' => 'Profiel Weergeven', 'edit_profile' => 'Profiel Bewerken', + // Layout tabs + 'tab_info' => 'Info', + 'tab_content' => 'Inhoud', + /** * Email Content */ From e3d570e92841700c9f93b45612a54c192fd56037 Mon Sep 17 00:00:00 2001 From: Nooto <50425610+NootoNooto@users.noreply.github.com> Date: Wed, 8 May 2019 23:25:13 +0200 Subject: [PATCH 03/12] Update activities.php --- resources/lang/nl/activities.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/lang/nl/activities.php b/resources/lang/nl/activities.php index f6c3db309..021b6d21e 100644 --- a/resources/lang/nl/activities.php +++ b/resources/lang/nl/activities.php @@ -36,6 +36,14 @@ return [ 'book_delete_notification' => 'Boek Succesvol Verwijderd', 'book_sort' => 'sorteerde boek', 'book_sort_notification' => 'Boek Succesvol Gesorteerd', + + // Bookshelves + 'bookshelf_create' => 'maakte Boekenplank', + 'bookshelf_create_notification' => 'Boekenplank Succesvol Aangemaakt', + 'bookshelf_update' => 'veranderde boekenplank', + 'bookshelf_update_notification' => 'Boekenplank Succesvol Bijgewerkt', + 'bookshelf_delete' => 'verwijderde boekenplank', + 'bookshelf_delete_notification' => 'Boekenplank Succesvol Verwijderd', // Other 'commented_on' => 'reactie op', From d0e351b9426350b54495124249278b54a2231624 Mon Sep 17 00:00:00 2001 From: Nooto <50425610+NootoNooto@users.noreply.github.com> Date: Wed, 8 May 2019 23:51:34 +0200 Subject: [PATCH 04/12] Added translations for Bookshelves --- resources/lang/nl/entities.php | 39 +++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/resources/lang/nl/entities.php b/resources/lang/nl/entities.php index 29bb11a37..caef8ccc0 100644 --- a/resources/lang/nl/entities.php +++ b/resources/lang/nl/entities.php @@ -65,16 +65,45 @@ return [ 'search_set_date' => 'Zet datum', 'search_update' => 'Update zoekresultaten', - /** - * Books - */ + // Shelves + 'shelf' => 'Plank', + 'shelves' => 'Planken', + 'x_shelves' => ':count Plank|:count Planken', + 'shelves_long' => 'Boekenplanken', + 'shelves_empty' => 'Er zijn geen planken aangemaakt', + 'shelves_create' => 'Nieuwe Plank Aanmaken', + 'shelves_popular' => 'Populaire Planken', + 'shelves_new' => 'Nieuwe Planken', + 'shelves_popular_empty' => 'De meest populaire planken worden hier weergegeven.', + 'shelves_new_empty' => 'De meest recent aangemaakt planken worden hier weergeven.', + 'shelves_save' => 'Plank Opslaan', + 'shelves_books' => 'Boeken op deze plank', + 'shelves_add_books' => 'Toevoegen boeken aan deze plank', + 'shelves_drag_books' => 'Sleep boeken hier naartoe om deze toe te voegen aan deze plank', + 'shelves_empty_contents' => 'Er zijn geen boeken aan deze plank toegekend', + 'shelves_edit_and_assign' => 'Bewerk plank om boeken toe te kennen.', + 'shelves_edit_named' => 'Bewerk Boekenplank :name', + 'shelves_edit' => 'Bewerk Boekenplank', + 'shelves_delete' => 'Verwijder Boekenplank', + 'shelves_delete_named' => 'Verwijder Boekenplank :name', + 'shelves_delete_explain' => "Deze actie verwijdert de boekenplank met naam ':name'. De boeken op deze plank worden niet verwijderd.", + 'shelves_delete_confirmation' => 'Weet je zeker dat je deze plank wilt verwijderen?', + 'shelves_permissions' => 'Boekenplank Permissies', + 'shelves_permissions_updated' => 'Boekenplank Permissies Opgeslagen', + 'shelves_permissions_active' => 'Boekenplank Permissies Actief', + 'shelves_copy_permissions_to_books' => 'Kopieer Permissies naar Boeken', + 'shelves_copy_permissions' => 'Kopieer Permissies', + 'shelves_copy_permissions_explain' => 'Met deze actie worden de permissies van deze boekenplank gekopieerd naar alle boeken op deze plank. Voordat deze actie wordt uitgevoerd, zorg dat de wijzigingen in de permissies van deze boekenplank zijn opgeslagen.', + 'shelves_copy_permission_success' => 'Boekenplank permissies gekopieerd naar :count boeken', + + // Books 'book' => 'Boek', 'books' => 'Boeken', - 'x_books' => ':count Boek|:count Boeken', + 'x_books' => ':count Boek|:count Boeken', 'books_empty' => 'Er zijn geen boeken aangemaakt', 'books_popular' => 'Populaire Boeken', 'books_recent' => 'Recente Boeken', - 'books_new' => 'Nieuwe Boeken', + 'books_new' => 'Nieuwe Boeken', 'books_popular_empty' => 'De meest populaire boeken worden hier weergegeven.', 'books_create' => 'Nieuw Boek Aanmaken', 'books_delete' => 'Boek Verwijderen', From cb355c8aad0e6f6d8cf0e29f1b61c96750d8cd91 Mon Sep 17 00:00:00 2001 From: Nooto <50425610+NootoNooto@users.noreply.github.com> Date: Wed, 8 May 2019 23:57:44 +0200 Subject: [PATCH 05/12] Modified Bookshelf texts --- resources/lang/nl/entities.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/lang/nl/entities.php b/resources/lang/nl/entities.php index caef8ccc0..34142ad7f 100644 --- a/resources/lang/nl/entities.php +++ b/resources/lang/nl/entities.php @@ -66,34 +66,34 @@ return [ 'search_update' => 'Update zoekresultaten', // Shelves - 'shelf' => 'Plank', - 'shelves' => 'Planken', - 'x_shelves' => ':count Plank|:count Planken', + 'shelf' => 'Boekenplank', + 'shelves' => 'Boekenplanken', + 'x_shelves' => ':count Boekenplank|:count Boekenplanken', 'shelves_long' => 'Boekenplanken', - 'shelves_empty' => 'Er zijn geen planken aangemaakt', - 'shelves_create' => 'Nieuwe Plank Aanmaken', - 'shelves_popular' => 'Populaire Planken', - 'shelves_new' => 'Nieuwe Planken', - 'shelves_popular_empty' => 'De meest populaire planken worden hier weergegeven.', - 'shelves_new_empty' => 'De meest recent aangemaakt planken worden hier weergeven.', - 'shelves_save' => 'Plank Opslaan', + 'shelves_empty' => 'Er zijn geen boekenplanken aangemaakt', + 'shelves_create' => 'Nieuwe Boekenplank Aanmaken', + 'shelves_popular' => 'Populaire Boekenplanken', + 'shelves_new' => 'Nieuwe Boekenplanken', + 'shelves_popular_empty' => 'De meest populaire boekenplanken worden hier weergegeven.', + 'shelves_new_empty' => 'De meest recent aangemaakt boekenplanken worden hier weergeven.', + 'shelves_save' => 'Boekenplanken Opslaan', 'shelves_books' => 'Boeken op deze plank', 'shelves_add_books' => 'Toevoegen boeken aan deze plank', 'shelves_drag_books' => 'Sleep boeken hier naartoe om deze toe te voegen aan deze plank', 'shelves_empty_contents' => 'Er zijn geen boeken aan deze plank toegekend', - 'shelves_edit_and_assign' => 'Bewerk plank om boeken toe te kennen.', + 'shelves_edit_and_assign' => 'Bewerk boekenplank om boeken toe te kennen.', 'shelves_edit_named' => 'Bewerk Boekenplank :name', 'shelves_edit' => 'Bewerk Boekenplank', 'shelves_delete' => 'Verwijder Boekenplank', 'shelves_delete_named' => 'Verwijder Boekenplank :name', 'shelves_delete_explain' => "Deze actie verwijdert de boekenplank met naam ':name'. De boeken op deze plank worden niet verwijderd.", - 'shelves_delete_confirmation' => 'Weet je zeker dat je deze plank wilt verwijderen?', + 'shelves_delete_confirmation' => 'Weet je zeker dat je deze boekenplank wilt verwijderen?', 'shelves_permissions' => 'Boekenplank Permissies', 'shelves_permissions_updated' => 'Boekenplank Permissies Opgeslagen', 'shelves_permissions_active' => 'Boekenplank Permissies Actief', 'shelves_copy_permissions_to_books' => 'Kopieer Permissies naar Boeken', 'shelves_copy_permissions' => 'Kopieer Permissies', - 'shelves_copy_permissions_explain' => 'Met deze actie worden de permissies van deze boekenplank gekopieerd naar alle boeken op deze plank. Voordat deze actie wordt uitgevoerd, zorg dat de wijzigingen in de permissies van deze boekenplank zijn opgeslagen.', + 'shelves_copy_permissions_explain' => 'Met deze actie worden de permissies van deze boekenplank gekopieerd naar alle boeken op de plank. Voordat deze actie wordt uitgevoerd, zorg dat de wijzigingen in de permissies van deze boekenplank zijn opgeslagen.', 'shelves_copy_permission_success' => 'Boekenplank permissies gekopieerd naar :count boeken', // Books From c459d86b58f26740ffdb9214183138e30d781bbb Mon Sep 17 00:00:00 2001 From: kostefun <43705266+kostefun@users.noreply.github.com> Date: Mon, 13 May 2019 17:21:05 +0700 Subject: [PATCH 06/12] Update common.php --- resources/lang/ru/common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/ru/common.php b/resources/lang/ru/common.php index 73853af8e..43693b752 100644 --- a/resources/lang/ru/common.php +++ b/resources/lang/ru/common.php @@ -26,6 +26,7 @@ return [ */ 'actions' => 'Действия', 'view' => 'Просмотр', + 'view_all' => 'Показать все', 'create' => 'Создание', 'update' => 'Обновление', 'edit' => 'Редактировать', From 215d84d705be1563b7b2b2983fb3a0351e5f6299 Mon Sep 17 00:00:00 2001 From: kostefun <43705266+kostefun@users.noreply.github.com> Date: Mon, 13 May 2019 17:31:19 +0700 Subject: [PATCH 07/12] Update entities.php --- resources/lang/ru/entities.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/ru/entities.php b/resources/lang/ru/entities.php index b72297684..448e4e6a1 100644 --- a/resources/lang/ru/entities.php +++ b/resources/lang/ru/entities.php @@ -105,11 +105,13 @@ return [ */ 'shelf' => 'Полка', 'shelves' => 'Полки', + 'x_shelves' => ':count полок|:count полок', 'shelves_long' => 'Книжные полки', 'shelves_empty' => 'Полки не созданы', 'shelves_create' => 'Создать новую полку', 'shelves_popular' => 'Популярные полки', 'shelves_new' => 'Новые полки', + 'shelves_new_action' => 'Новая полка', 'shelves_popular_empty' => 'Популярные полки появятся здесь.', 'shelves_new_empty' => 'Последние созданные полки появятся здесь.', 'shelves_save' => 'Сохранить полку', From 0ee9e5c4dbf2d3ffa8b81242187d63231cfc7c02 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Wed, 15 May 2019 20:23:09 +0100 Subject: [PATCH 08/12] Updated both editors to ignore image paste if text data apparent Designed to ignore image data when copying from a spreadsheet. Fixes #987 --- .../assets/js/components/markdown-editor.js | 17 ++++++++++++++--- .../assets/js/components/wysiwyg-editor.js | 17 +++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/resources/assets/js/components/markdown-editor.js b/resources/assets/js/components/markdown-editor.js index 770b4af50..5fa16ef6e 100644 --- a/resources/assets/js/components/markdown-editor.js +++ b/resources/assets/js/components/markdown-editor.js @@ -180,9 +180,20 @@ class MarkdownEditor { // Handle image paste cm.on('paste', (cm, event) => { - if (!event.clipboardData || !event.clipboardData.items) return; - for (let i = 0; i < event.clipboardData.items.length; i++) { - uploadImage(event.clipboardData.items[i].getAsFile()); + const clipboardItems = event.clipboardData.items; + if (!event.clipboardData || !clipboardItems) return; + + // Don't handle if clipboard includes text content + for (let clipboardItem of clipboardItems) { + if (clipboardItem.type.includes('text/')) { + return; + } + } + + for (let clipboardItem of clipboardItems) { + if (clipboardItem.type.includes("image")) { + uploadImage(clipboardItem.getAsFile()); + } } }); diff --git a/resources/assets/js/components/wysiwyg-editor.js b/resources/assets/js/components/wysiwyg-editor.js index 46fe967e0..614cfb80f 100644 --- a/resources/assets/js/components/wysiwyg-editor.js +++ b/resources/assets/js/components/wysiwyg-editor.js @@ -8,11 +8,20 @@ import DrawIO from "../services/drawio"; * @param editor */ function editorPaste(event, editor, wysiwygComponent) { - if (!event.clipboardData || !event.clipboardData.items) return; + const clipboardItems = event.clipboardData.items; + if (!event.clipboardData || !clipboardItems) return; - for (let clipboardItem of event.clipboardData.items) { - if (clipboardItem.type.indexOf("image") === -1) continue; - event.preventDefault(); + // Don't handle if clipboard includes text content + for (let clipboardItem of clipboardItems) { + if (clipboardItem.type.includes('text/')) { + return; + } + } + + for (let clipboardItem of clipboardItems) { + if (!clipboardItem.type.includes("image")) { + continue; + } const id = "image-" + Math.random().toString(16).slice(2); const loadingImage = window.baseUrl('/loading.gif'); From 896f88174a9f8e2e90c9fe1b14fcbec3fcb48930 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Wed, 15 May 2019 21:02:11 +0100 Subject: [PATCH 09/12] Updated page navigation logic to ignore empty headers Fixes #1429 --- app/Entities/Repos/PageRepo.php | 32 ++++++++++++++++++-------------- tests/{ => Unit}/HelpersTest.php | 0 tests/Unit/PageRepoTest.php | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 14 deletions(-) rename tests/{ => Unit}/HelpersTest.php (100%) create mode 100644 tests/Unit/PageRepoTest.php diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php index 1aeee8dae..208aa5fa3 100644 --- a/app/Entities/Repos/PageRepo.php +++ b/app/Entities/Repos/PageRepo.php @@ -422,25 +422,29 @@ class PageRepo extends EntityRepo return []; } - $tree = collect([]); - foreach ($headers as $header) { - $text = $header->nodeValue; - $tree->push([ + $tree = collect($headers)->map(function($header) { + $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue)); + if (strlen($text) > 30) { + $text = substr($text, 0, 27) . '...'; + } + + return [ 'nodeName' => strtolower($header->nodeName), 'level' => intval(str_replace('h', '', $header->nodeName)), 'link' => '#' . $header->getAttribute('id'), - 'text' => strlen($text) > 30 ? substr($text, 0, 27) . '...' : $text - ]); - } + 'text' => $text, + ]; + })->filter(function($header) { + return strlen($header['text']) > 0; + }); // Normalise headers if only smaller headers have been used - if (count($tree) > 0) { - $minLevel = $tree->pluck('level')->min(); - $tree = $tree->map(function ($header) use ($minLevel) { - $header['level'] -= ($minLevel - 2); - return $header; - }); - } + $minLevel = $tree->pluck('level')->min(); + $tree = $tree->map(function ($header) use ($minLevel) { + $header['level'] -= ($minLevel - 2); + return $header; + }); + return $tree->toArray(); } diff --git a/tests/HelpersTest.php b/tests/Unit/HelpersTest.php similarity index 100% rename from tests/HelpersTest.php rename to tests/Unit/HelpersTest.php diff --git a/tests/Unit/PageRepoTest.php b/tests/Unit/PageRepoTest.php new file mode 100644 index 000000000..36addcbe4 --- /dev/null +++ b/tests/Unit/PageRepoTest.php @@ -0,0 +1,32 @@ +pageRepo = app()->make(PageRepo::class); + } + + public function test_get_page_nav_does_not_show_empty_titles() + { + $content = '

Hello

 

'; + $navMap = $this->pageRepo->getPageNav($content); + + $this->assertCount(1, $navMap); + $this->assertArraySubset([ + 'nodeName' => 'h1', + 'link' => '#testa', + 'text' => 'Hello' + ], $navMap[0]); + } + +} \ No newline at end of file From 0a0ceb382ea646b8773ed32405271705dd26ccfc Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 19 May 2019 14:52:17 +0100 Subject: [PATCH 10/12] Doubled image upload display thumb size Related to #1108 --- app/Uploads/ImageRepo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php index 38dd3066b..da0b7d379 100644 --- a/app/Uploads/ImageRepo.php +++ b/app/Uploads/ImageRepo.php @@ -230,7 +230,7 @@ class ImageRepo { $image->thumbs = [ 'gallery' => $this->getThumbnail($image, 150, 150, false), - 'display' => $this->getThumbnail($image, 840, null, true) + 'display' => $this->getThumbnail($image, 1680, null, true) ]; } From 0c3dc50cd99ab714774b7bcc47dc5ba355d7bbef Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 19 May 2019 15:06:52 +0100 Subject: [PATCH 11/12] Added mobile search bar on search page Since the header one hides on mobile devices. Fixes #1450 --- resources/views/search/all.blade.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index fba67abf9..03c0b93e7 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -190,6 +190,11 @@

{{ trans('entities.search_results') }}

+
+ + + +
{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}
@include('partials.entity-list', ['entities' => $entities, 'showPath' => true]) From e1e1ea6099dd3a4e6fd8be1311ef0168e044a8d0 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 19 May 2019 15:30:58 +0100 Subject: [PATCH 12/12] Amended page save button layout to fix z-index issues - Added a new mobile save button instead of trying to reposition the original. - Also recuced the point where the editor top toolbar will collapse to become x-scrollable. Fixes #1424 --- resources/assets/sass/_layout.scss | 4 ++-- resources/assets/sass/_pages.scss | 36 +++++++++++++--------------- resources/views/pages/form.blade.php | 6 +++-- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/resources/assets/sass/_layout.scss b/resources/assets/sass/_layout.scss index 9bb4e1c70..4be6edb56 100644 --- a/resources/assets/sass/_layout.scss +++ b/resources/assets/sass/_layout.scss @@ -59,7 +59,7 @@ } @include smaller-than($m) { - .grid.third { + .grid.third:not(.no-break) { grid-template-columns: 1fr 1fr; } .grid.half:not(.no-break), .grid.left-focus:not(.no-break), .grid.right-focus:not(.no-break) { @@ -81,7 +81,7 @@ } @include smaller-than($s) { - .grid.third { + .grid.third:not(.no-break) { grid-template-columns: 1fr; } } diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index d02f59e37..c58f6ef47 100755 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -20,11 +20,10 @@ } } -@include smaller-than($m) { +@include smaller-than($s) { .page-edit-toolbar { overflow-x: scroll; overflow-y: visible; - z-index: 12; } .page-edit-toolbar .grid.third { display: block; @@ -35,24 +34,21 @@ } } -@include smaller-than($m) { - .page-edit-toolbar #save-button { - position: fixed; - z-index: 30; - border-radius: 50%; - width: 56px; - height: 56px; - font-size: 24px; - right: $-m; - bottom: $-s; - box-shadow: $bs-hover; - background-color: currentColor; - svg { - fill: #FFF; - } - span { - display: none; - } +.page-save-mobile-button { + position: fixed; + z-index: 30; + border-radius: 50%; + width: 56px; + height: 56px; + font-size: 24px; + right: $-m; + bottom: $-s; + box-shadow: $bs-hover; + background-color: currentColor; + text-align: center; + svg { + fill: #FFF; + margin-right: 0; } } diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index 34ded389c..4a473e536 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -12,7 +12,7 @@ {{--Header Bar--}}
-
+
@icon('back'){{ trans('common.back') }} @@ -49,7 +49,7 @@ {{-- Prevents button jumping on menu show --}}
- +
@@ -120,4 +120,6 @@ @endif
+ +
\ No newline at end of file