Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] Bootstrap 5 + PHP 8 + vanilla javascript #1021

Merged
merged 10 commits into from
Jan 24, 2023
Merged

Conversation

f3l1x
Copy link
Member

@f3l1x f3l1x commented Mar 6, 2022

No description provided.

@petrparolek
Copy link
Contributor

bude i zpětná kompatibilita s BS 4?

@f3l1x
Copy link
Member Author

f3l1x commented Mar 6, 2022

Rekl bych, ze na to nemame kapacity ani prostredky. Nejspis ne.

@radimvaculik
Copy link
Member

@f3l1x Přibalil bych do toho PR i bump bootstrap-select, protože to jde ruku v ruce.

@f3l1x f3l1x mentioned this pull request Mar 21, 2022
@f3l1x f3l1x added this to the v7.x milestone Mar 21, 2022
@f3l1x f3l1x changed the title Bootstrap 5 [7.x] Bootstrap 5 Mar 21, 2022
assets/datagrid.css Outdated Show resolved Hide resolved
@dakorpar
Copy link
Member

@f3l1x @paveljanda What's the status of this? Any ETA? Can I help?

@radimvaculik
Copy link
Member

It's ready. If you can test it, please do it.

@dakorpar
Copy link
Member

dakorpar commented Jul 18, 2022

Can someone update branch then? it's behind master and I need compatibility with latte 2.11/3.0...

@radimvaculik
Copy link
Member

@dakorpar Rebased. Could you try it, please?

@radimvaculik
Copy link
Member

@dakorpar All good?

@foxycode
Copy link
Member

Any progress with this? I tested using "ublaboo/datagrid": "dev-master#554662a" in composer.json. I see selects are deformed and filter hide button doesn't work either.

image

@radimvaculik
Copy link
Member

@foxycode How do you load CSS?

@foxycode
Copy link
Member

@radimvaculik That would be the problem, using CDN 🙂

Can you advise how to use CSS from this commit?

@radimvaculik
Copy link
Member

Use webpack, gulp or another asset builder.

@foxycode
Copy link
Member

@radimvaculik Tested, looks good.

@foxycode
Copy link
Member

foxycode commented Jan 16, 2023

Any news about merge date? I am using it without problem for some time. At lease pre-release would be fine.

@radimvaculik
Copy link
Member

@foxycode See #1025

@f3l1x f3l1x changed the title [7.x] Bootstrap 5 [7.x] Bootstrap 5 + PHP 8 + vanila javascript Jan 17, 2023
@f3l1x f3l1x changed the title [7.x] Bootstrap 5 + PHP 8 + vanila javascript [7.x] Bootstrap 5 + PHP 8 + vanilla javascript Jan 17, 2023
@radimvaculik radimvaculik changed the base branch from master to next January 24, 2023 08:43
@radimvaculik radimvaculik merged commit 53af3f6 into next Jan 24, 2023
@radimvaculik radimvaculik deleted the fx/bootstrap5 branch January 24, 2023 09:11
radimvaculik added a commit that referenced this pull request Feb 10, 2023
* Bootstrap 5

* Bootstrap 5 (docs)

* Bootstrap 5

* form-control -> form-select

* Bump bootstrap-select for Bootstrap 5 support

* Removed `input-sm` from Bootstrap 3

See https://getbootstrap.com/docs/4.0/migration/#forms-1

* Bootstrap 5: When selectpicker, replace form-select classes with form-control and refresh it

* Hide `underline` also for `dropdown-item`. And merged into one CSS rule.

* Update the filterMultiSelect initialization

* Text-align: left -> start

Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>
Co-authored-by: Jaroslav Líbal <jaroslav.libal@neatous.cz>
RYUcze pushed a commit to RYUcze/datagrid that referenced this pull request Jul 10, 2023
* Bootstrap 5

* Bootstrap 5 (docs)

* Bootstrap 5

* form-control -> form-select

* Bump bootstrap-select for Bootstrap 5 support

* Removed `input-sm` from Bootstrap 3

See https://getbootstrap.com/docs/4.0/migration/#forms-1

* Bootstrap 5: When selectpicker, replace form-select classes with form-control and refresh it

* Hide `underline` also for `dropdown-item`. And merged into one CSS rule.

* Update the filterMultiSelect initialization

* Text-align: left -> start

Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>
Co-authored-by: Jaroslav Líbal <jaroslav.libal@neatous.cz>
MrVoltz pushed a commit to JIHO-Innovations/datagrid that referenced this pull request Feb 2, 2024
* Bootstrap 5

* Bootstrap 5 (docs)

* Bootstrap 5

* form-control -> form-select

* Bump bootstrap-select for Bootstrap 5 support

* Removed `input-sm` from Bootstrap 3

See https://getbootstrap.com/docs/4.0/migration/#forms-1

* Bootstrap 5: When selectpicker, replace form-select classes with form-control and refresh it

* Hide `underline` also for `dropdown-item`. And merged into one CSS rule.

* Update the filterMultiSelect initialization

* Text-align: left -> start

Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>
Co-authored-by: Jaroslav Líbal <jaroslav.libal@neatous.cz>
paveljanda added a commit that referenced this pull request Mar 13, 2024
* PHP 8.0

* Translator: switch from ITranslator to Translator (#973)

* [7.x] Bootstrap 5 + PHP 8 + vanilla javascript (#1021)

* Bootstrap 5

* Bootstrap 5 (docs)

* Bootstrap 5

* form-control -> form-select

* Bump bootstrap-select for Bootstrap 5 support

* Removed `input-sm` from Bootstrap 3

See https://getbootstrap.com/docs/4.0/migration/#forms-1

* Bootstrap 5: When selectpicker, replace form-select classes with form-control and refresh it

* Hide `underline` also for `dropdown-item`. And merged into one CSS rule.

* Update the filterMultiSelect initialization

* Text-align: left -> start

Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>
Co-authored-by: Jaroslav Líbal <jaroslav.libal@neatous.cz>

* [7.x] phpstan-deprecation-rules (#1061)

* Fix sort

* Add method for setting custom Action href, v6.x (#853)

* [7.x] Nextras ORM 4 support, closes #984

* Fix ElasticsearchDataSource.php data source (#1041)

* Error: Typed property Ublaboo\DataGrid\InlineEdit\InlineEdit::$itemID must not be accessed before initialization

* composer: allow-plugins: php-http/discovery

* ItemDetailForm: $httpPost: Typed property must not be accessed...

* phpstan: revert  --memory-limit=4G

* NetteDatabaseSelectionHelper: Context -> Explorer, getSupplementalDriver -> getDriver

* Update README.md

* Templates: fix variables

* data-bs-toggle attribute for multiaction button (#1072)

* dependabot.yml (#1078)

* Allow nette/utils:4.0 (#1077)

* Add onColumnShow and onColumnHide event methods (#1076)

* Add onColumnShow and onColumnHide event methods

* Add native type array

* Removed duplicity

* Return value of BackedEnum when reading Doctrine entity property. (#1081)

* Return value of BackedEnum when reading array value (#1083)

* Added method to check if filter is on default values; Closes #1082 (#1084)

* ublaboo -> contributte (#1067) (#1075)

* Delete dependabot.yml

* Gitignore: remove compat.php

* Assets: rewrite to TS and plugin system

* Add missing phpdoc type (#1090)

* Add support for `nette/utils` version `4.0.0` (#1086)

* Add missing phpdoc type

---------

Co-authored-by: Dominik Harmim <harmim6@gmail.com>

* fix: resolution name for datagrid -> attribute instead of class

* Fix timeout utils.ts (#1091)

During the build 
[tsl] ERROR in /node_modules/ublaboo-datagrid/assets/utils.ts(130,3)
      TS2322: Type 'Timeout' is not assignable to type 'number'.

* Typo fixes in docs (#1088)

* Fixed typos in columns.md

* Fixed typos in actions.md

* Update data-source.md

* Fixed typos in export.md

* Fixed typos, missing/redundant words in filters.md

* Update columns.md

* Fixed typos group-action.md

* Fixed typo inline-edit.md

* Fixed missin comma localization.md

* Fixed typos row.md

* Add support for `nette/utils` version `4.0.0` (#1086)

* Update .docs/export.md

Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>

---------

Co-authored-by: Dominik Harmim <harmim6@gmail.com>
Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>

* Housekeep: Fix cs & phpstan issues (#1097)

* Fix: Github Actions: Coverage (#1098)

* Using data-datagrid-name="<name>" instead if data-datagrid-<name>

* Fixed CSS: change .datagrid selector to [data-datagrid-name]

* Fixed inline edit plugin

* phpstan fix

* Minor CSS changes for the next verison of datagrid

* Fix cs & phpstan

* Fix failing tests

* PHP 8.1 is new minimal version

* Fix phpstan

---------

Co-authored-by: Radim Vaculík <radim.vaculik@gmail.com>
Co-authored-by: Jaroslav Líbal <jaroslav.libal@neatous.cz>
Co-authored-by: Pavel Linhart <pavel.linhart@gmail.com>
Co-authored-by: Jan Bednář <honzaxp01@gmail.com>
Co-authored-by: emololftw <60448217+emololftw@users.noreply.github.com>
Co-authored-by: Vojtěch Kaizr <wojtishek@users.noreply.github.com>
Co-authored-by: jiriermis <46221089+jiriermis@users.noreply.github.com>
Co-authored-by: Martin Procházka <juniwalk@outlook.cz>
Co-authored-by: Mia Vališová (Liliana) <118116415+lilianalillyy@users.noreply.github.com>
Co-authored-by: Vít Kutný <vit@kutny.cz>
Co-authored-by: Dominik Harmim <harmim6@gmail.com>
Co-authored-by: Tomáš Mîčka <tomas.micka@logmanager.com>
Co-authored-by: Martin Kokeš <info@martinkokes.cz>
Co-authored-by: RYUcze <125459293+RYUcze@users.noreply.github.com>
Co-authored-by: Pavel Janda <me@paveljanda.com>
Co-authored-by: Kryštof Záhumenský <zahumensky.krystof@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants