From f5da53a761baadf49900bc4c8155b600e9b713b9 Mon Sep 17 00:00:00 2001 From: Katharina Bogad Date: Thu, 24 Jun 2021 22:46:47 +0200 Subject: [PATCH] Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) --- views/about.blade.php | 2 +- views/barcodescannertesting.blade.php | 2 +- views/batteries.blade.php | 4 ++-- views/batteriesjournal.blade.php | 4 ++-- views/batteriesoverview.blade.php | 4 ++-- views/batteriessettings.blade.php | 2 +- views/batteryform.blade.php | 2 +- views/batterytracking.blade.php | 4 ++-- views/choreform.blade.php | 2 +- views/chores.blade.php | 4 ++-- views/choresjournal.blade.php | 4 ++-- views/choresoverview.blade.php | 6 +++--- views/choressettings.blade.php | 2 +- views/choretracking.blade.php | 4 ++-- views/components/barcodescanner.blade.php | 2 +- views/components/productamountpicker.blade.php | 4 ++-- views/components/productcard.blade.php | 2 +- views/consume.blade.php | 4 ++-- views/equipment.blade.php | 4 ++-- views/equipmentform.blade.php | 4 ++-- views/inventory.blade.php | 4 ++-- views/locationform.blade.php | 2 +- views/locations.blade.php | 2 +- views/login.blade.php | 2 +- views/manageapikeys.blade.php | 2 +- views/productbarcodeform.blade.php | 2 +- views/productform.blade.php | 4 ++-- views/productgroupform.blade.php | 2 +- views/productgroups.blade.php | 2 +- views/products.blade.php | 6 +++--- views/purchase.blade.php | 4 ++-- views/quantityunitconversionform.blade.php | 2 +- views/quantityunitform.blade.php | 4 ++-- views/quantityunitpluraltesting.blade.php | 2 +- views/quantityunits.blade.php | 2 +- views/recipeform.blade.php | 4 ++-- views/recipeposform.blade.php | 4 ++-- views/recipes.blade.php | 8 ++++---- views/recipessettings.blade.php | 2 +- views/shoppinglist.blade.php | 10 +++++----- views/shoppinglistform.blade.php | 2 +- views/shoppinglistitemform.blade.php | 2 +- views/shoppinglistsettings.blade.php | 2 +- views/shoppinglocationform.blade.php | 2 +- views/shoppinglocations.blade.php | 2 +- views/stockentries.blade.php | 2 +- views/stockentryform.blade.php | 2 +- views/stockentrylabel.blade.php | 2 +- views/stockjournal.blade.php | 10 +++++----- views/stockjournalsummary.blade.php | 8 ++++---- views/stockoverview.blade.php | 8 ++++---- views/stocksettings.blade.php | 2 +- views/taskcategories.blade.php | 2 +- views/taskcategoryform.blade.php | 2 +- views/taskform.blade.php | 2 +- views/tasks.blade.php | 6 +++--- views/taskssettings.blade.php | 2 +- views/transfer.blade.php | 4 ++-- views/userentities.blade.php | 2 +- views/userentityform.blade.php | 2 +- views/userfieldform.blade.php | 2 +- views/userfields.blade.php | 4 ++-- views/userform.blade.php | 4 ++-- views/userobjectform.blade.php | 2 +- views/userobjects.blade.php | 2 +- views/users.blade.php | 2 +- views/usersettings.blade.php | 2 +- 67 files changed, 110 insertions(+), 110 deletions(-) diff --git a/views/about.blade.php b/views/about.blade.php index 30aa8fff..dea55f33 100644 --- a/views/about.blade.php +++ b/views/about.blade.php @@ -5,7 +5,7 @@ @section('content')
-
+

@yield('title')

    diff --git a/views/barcodescannertesting.blade.php b/views/barcodescannertesting.blade.php index b03b7d34..581263d9 100644 --- a/views/barcodescannertesting.blade.php +++ b/views/barcodescannertesting.blade.php @@ -19,7 +19,7 @@
    -
    +
    diff --git a/views/batteries.blade.php b/views/batteries.blade.php index 551984cb..89b15260 100644 --- a/views/batteries.blade.php +++ b/views/batteries.blade.php @@ -42,7 +42,7 @@
    -
    +
    @@ -53,7 +53,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
    -
    +
    @@ -34,7 +34,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Battery') }} diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php index eb61e236..729e65a1 100644 --- a/views/batteriesoverview.blade.php +++ b/views/batteriesoverview.blade.php @@ -55,7 +55,7 @@
    -
    +
    @@ -66,7 +66,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Status') }} diff --git a/views/batteriessettings.blade.php b/views/batteriessettings.blade.php index a9c4838a..3ea2a2a5 100644 --- a/views/batteriessettings.blade.php +++ b/views/batteriessettings.blade.php @@ -14,7 +14,7 @@
    -
    +

    {{ $__t('Batteries overview') }}

    @include('components.numberpicker', array( 'id' => 'batteries_due_soon_days', diff --git a/views/batteryform.blade.php b/views/batteryform.blade.php index c145893d..3d679a3e 100644 --- a/views/batteryform.blade.php +++ b/views/batteryform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/chores.blade.php b/views/chores.blade.php index f85f02bb..25ee3ccb 100644 --- a/views/chores.blade.php +++ b/views/chores.blade.php @@ -42,7 +42,7 @@
    -
    +
    @@ -53,7 +53,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
    -
    +
    @@ -34,7 +34,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Chore') }} diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php index a64c5133..82b36ef0 100644 --- a/views/choresoverview.blade.php +++ b/views/choresoverview.blade.php @@ -60,7 +60,7 @@
    -
    +
    @@ -71,7 +71,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Status') }} @@ -85,7 +85,7 @@
    @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) -
    +
     {{ $__t('Assignment') }} diff --git a/views/choressettings.blade.php b/views/choressettings.blade.php index 70eac032..339e4b02 100644 --- a/views/choressettings.blade.php +++ b/views/choressettings.blade.php @@ -14,7 +14,7 @@
    -
    +

    {{ $__t('Chores overview') }}

    @include('components.numberpicker', array( 'id' => 'chores_due_soon_days', diff --git a/views/choretracking.blade.php b/views/choretracking.blade.php index 7c68fa08..400a2b27 100644 --- a/views/choretracking.blade.php +++ b/views/choretracking.blade.php @@ -6,7 +6,7 @@ @section('content')
    -
    +

    @yield('title')

    @@ -58,7 +58,7 @@
    -
    +
    @include('components.chorecard')
    diff --git a/views/components/barcodescanner.blade.php b/views/components/barcodescanner.blade.php index e4364f95..cd18a70c 100644 --- a/views/components/barcodescanner.blade.php +++ b/views/components/barcodescanner.blade.php @@ -25,4 +25,4 @@ @endpush -@endif \ No newline at end of file +@endif diff --git a/views/components/productamountpicker.blade.php b/views/components/productamountpicker.blade.php index 0736454c..276d769b 100644 --- a/views/components/productamountpicker.blade.php +++ b/views/components/productamountpicker.blade.php @@ -21,13 +21,13 @@ 'min' => $DEFAULT_MIN_AMOUNT, 'decimals' => $userSettings['stock_decimal_places_amounts'], 'value' => $value, - 'additionalGroupCssClasses' => 'col-sm-5 col-xs-12 my-0', + 'additionalGroupCssClasses' => 'col-sm-5 col-12 my-0', 'additionalCssClasses' => 'input-group-productamountpicker locale-number-input locale-number-quantity-amount', 'additionalHtmlContextHelp' => '', 'additionalHtmlElements' => '' )) -
    +
    -
    +
    -
    +

    @yield('title')

    -
    +
    @include('components.productcard')
    diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php index 5d4a0193..025c2886 100644 --- a/views/quantityunitconversionform.blade.php +++ b/views/quantityunitconversionform.blade.php @@ -27,7 +27,7 @@
    -
    +
    @@ -97,7 +97,7 @@
    -
    +
    diff --git a/views/quantityunitpluraltesting.blade.php b/views/quantityunitpluraltesting.blade.php index 84577500..9112729d 100644 --- a/views/quantityunitpluraltesting.blade.php +++ b/views/quantityunitpluraltesting.blade.php @@ -19,7 +19,7 @@
    -
    +
    diff --git a/views/quantityunits.blade.php b/views/quantityunits.blade.php index 8386c97d..8f676110 100644 --- a/views/quantityunits.blade.php +++ b/views/quantityunits.blade.php @@ -42,7 +42,7 @@
    -
    +
    diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php index a1862f7e..c272383b 100644 --- a/views/recipeform.blade.php +++ b/views/recipeform.blade.php @@ -36,7 +36,7 @@
    -
    +
    @@ -108,7 +108,7 @@
    -
    +
    diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php index 187ddae9..d6e5f091 100644 --- a/views/recipeposform.blade.php +++ b/views/recipeposform.blade.php @@ -27,7 +27,7 @@
    -
    +
    -
    +

    @yield('title')

    @@ -39,7 +39,7 @@
    -
    +
    @@ -51,7 +51,7 @@
    -
    +
     {{ $__t('Status') }} @@ -205,7 +205,7 @@ $allRecipes = $selectedRecipeSubRecipes; array_unshift($allRecipes, $selectedRecipe); @endphp -
    +
    @if(count($allRecipes) > 1) diff --git a/views/recipessettings.blade.php b/views/recipessettings.blade.php index 9d0e83ff..1303dcf5 100644 --- a/views/recipessettings.blade.php +++ b/views/recipessettings.blade.php @@ -14,7 +14,7 @@
    -
    +

    {{ $__t('Recipe card') }}

    diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php index 22d1123c..bcaebf7b 100644 --- a/views/shoppinglist.blade.php +++ b/views/shoppinglist.blade.php @@ -110,7 +110,7 @@
    -
    +
    @@ -121,7 +121,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Status') }} @@ -148,7 +148,7 @@
    -
    +
    @@ -275,12 +275,12 @@ @if(boolval($userSettings['shopping_list_show_calendar'])) -
    +
    @include('components.calendarcard')
    @endif -
    +
    diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php index b807067d..fced868c 100644 --- a/views/shoppinglistform.blade.php +++ b/views/shoppinglistform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php index 8d1b87d8..8d84b32d 100644 --- a/views/shoppinglistitemform.blade.php +++ b/views/shoppinglistitemform.blade.php @@ -23,7 +23,7 @@
    -
    +
    diff --git a/views/shoppinglistsettings.blade.php b/views/shoppinglistsettings.blade.php index 7eb5b2c9..ebdc3166 100644 --- a/views/shoppinglistsettings.blade.php +++ b/views/shoppinglistsettings.blade.php @@ -14,7 +14,7 @@
    -
    +

    {{ $__t('Shopping list') }}

    diff --git a/views/shoppinglocationform.blade.php b/views/shoppinglocationform.blade.php index a47b2ba8..0c7aa4ac 100644 --- a/views/shoppinglocationform.blade.php +++ b/views/shoppinglocationform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/shoppinglocations.blade.php b/views/shoppinglocations.blade.php index 6306f565..24084285 100644 --- a/views/shoppinglocations.blade.php +++ b/views/shoppinglocations.blade.php @@ -42,7 +42,7 @@
    -
    +
    diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php index d8cd4b59..f3be05fd 100644 --- a/views/stockentries.blade.php +++ b/views/stockentries.blade.php @@ -31,7 +31,7 @@
    -
    +
    @include('components.productpicker', array( 'products' => $products, 'disallowAllProductWorkflows' => true, diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php index e92eba13..c3f4c8ea 100644 --- a/views/stockentryform.blade.php +++ b/views/stockentryform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/stockentrylabel.blade.php b/views/stockentrylabel.blade.php index cf126361..036c198c 100644 --- a/views/stockentrylabel.blade.php +++ b/views/stockentrylabel.blade.php @@ -37,4 +37,4 @@

    - \ No newline at end of file + diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php index 284d09d6..61c38eb7 100644 --- a/views/stockjournal.blade.php +++ b/views/stockjournal.blade.php @@ -34,7 +34,7 @@
    -
    +
    @@ -45,7 +45,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Product') }} @@ -59,7 +59,7 @@
    -
    +
     {{ $__t('Transaction type') }} @@ -73,7 +73,7 @@
    -
    +
     {{ $__t('Location') }} @@ -87,7 +87,7 @@
    -
    +
     {{ $__t('User') }} diff --git a/views/stockjournalsummary.blade.php b/views/stockjournalsummary.blade.php index f1b0726b..3c6d6ef1 100644 --- a/views/stockjournalsummary.blade.php +++ b/views/stockjournalsummary.blade.php @@ -23,7 +23,7 @@
    -
    +
    @@ -34,7 +34,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Product') }} @@ -48,7 +48,7 @@
    -
    +
     {{ $__t('Transaction type') }} @@ -62,7 +62,7 @@
    -
    +
     {{ $__t('User') }} diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index 3458f897..e7f8510d 100755 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -82,7 +82,7 @@
    -
    +
    @@ -94,7 +94,7 @@
    @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) -
    +
     {{ $__t('Location') }} @@ -109,7 +109,7 @@
    @endif -
    +
     {{ $__t('Product group') }} @@ -123,7 +123,7 @@
    -
    +
     {{ $__t('Status') }} diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php index 697e798f..7e95c8ae 100644 --- a/views/stocksettings.blade.php +++ b/views/stocksettings.blade.php @@ -14,7 +14,7 @@
    -
    +

    {{ $__t('Presets for new products') }}

    diff --git a/views/taskcategories.blade.php b/views/taskcategories.blade.php index 96dcab79..af31c9f0 100644 --- a/views/taskcategories.blade.php +++ b/views/taskcategories.blade.php @@ -42,7 +42,7 @@
    -
    +
    diff --git a/views/taskcategoryform.blade.php b/views/taskcategoryform.blade.php index 3e96afc9..127f13f4 100644 --- a/views/taskcategoryform.blade.php +++ b/views/taskcategoryform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/taskform.blade.php b/views/taskform.blade.php index 8b0937c1..1e38b99d 100644 --- a/views/taskform.blade.php +++ b/views/taskform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/tasks.blade.php b/views/tasks.blade.php index d62b1009..f162aea3 100644 --- a/views/tasks.blade.php +++ b/views/tasks.blade.php @@ -55,7 +55,7 @@
    -
    +
    @@ -66,7 +66,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Status') }} @@ -79,7 +79,7 @@
    -
    +
    -
    +
    @include('components.numberpicker', array( 'id' => 'tasks_due_soon_days', diff --git a/views/transfer.blade.php b/views/transfer.blade.php index 16f6d2d4..b35be860 100644 --- a/views/transfer.blade.php +++ b/views/transfer.blade.php @@ -11,7 +11,7 @@
    -
    +

    @yield('title')

    @@ -90,7 +90,7 @@
    -
    +
    @include('components.productcard')
    diff --git a/views/userentities.blade.php b/views/userentities.blade.php index 7eddb65b..7cf3c81b 100644 --- a/views/userentities.blade.php +++ b/views/userentities.blade.php @@ -38,7 +38,7 @@
    -
    +
    diff --git a/views/userentityform.blade.php b/views/userentityform.blade.php index e6079913..7f183db4 100644 --- a/views/userentityform.blade.php +++ b/views/userentityform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/userfieldform.blade.php b/views/userfieldform.blade.php index b03d593a..cd47b182 100644 --- a/views/userfieldform.blade.php +++ b/views/userfieldform.blade.php @@ -18,7 +18,7 @@
    -
    +
    diff --git a/views/userfields.blade.php b/views/userfields.blade.php index 98b706f8..1002b813 100644 --- a/views/userfields.blade.php +++ b/views/userfields.blade.php @@ -39,7 +39,7 @@
    -
    +
    @@ -50,7 +50,7 @@ placeholder="{{ $__t('Search') }}">
    -
    +
     {{ $__t('Entity') }} diff --git a/views/userform.blade.php b/views/userform.blade.php index dac69d95..b3be676d 100644 --- a/views/userform.blade.php +++ b/views/userform.blade.php @@ -18,7 +18,7 @@
    -
    +
    @@ -95,7 +95,7 @@
    -
    +

    {{ $__t('Picture') }} diff --git a/views/userobjectform.blade.php b/views/userobjectform.blade.php index 61f3b583..424cbd32 100644 --- a/views/userobjectform.blade.php +++ b/views/userobjectform.blade.php @@ -18,7 +18,7 @@
    -
    +