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

Upgrade bootstrap to 4.6 #46

Merged
merged 6 commits into from
May 1, 2023
Merged

Upgrade bootstrap to 4.6 #46

merged 6 commits into from
May 1, 2023

Conversation

leo-schick
Copy link
Member

@leo-schick leo-schick commented Feb 21, 2023

@leo-schick leo-schick added this to the 2.4.0 milestone Feb 21, 2023
Makefile Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
overflow-x: auto;
overflow-y: hidden;
}

#mara-main div.card div.card-block > div.card-block-content > *:first-child {
#mara-main div.card div.list-group > div.list-group-item > *:first-child {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huih, this might need an extra changelog entry that one should check the UI of the final mara app, especially if one is using some bootstrap styling in custom modules...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, right... this breaking change was introduced by 4.0. Mara still runs on a alpha version of bootstrap (#33)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change requires mara/mara-pipelines#66 to be merged as well. Do you have an idea how to tell pip that the next mara-app version 2.4 requires the next mara-pipelines version 3.4.0?

Currently there is no requirement between mara-app and mara-pipelines. Is there a way to tell that when package XYZ is installed, it must be above or below version 2.4/3.4.0?

Copy link
Member

@jankatins jankatins Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not know about any way to exclude certain packages, just depend on certain versions.

If there is a requirement, I would say add one? Or why do they need to be installed together? (maybe put the UI part into a special sub install target (similar to test) and declare it there (and install it per default!)? Then if someone wants to use pipelines without UI, they can install the bare minimum and not the UI?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like that default targets are not supported. See here. I think I will just merge it in the next minor version and make a note in the changelog in both repositories.

Copy link
Member

@jankatins jankatins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, but I would suggest writing a changelog entry and looking if the overall makefile target still makes sense

Makefile Outdated Show resolved Hide resolved
@leo-schick leo-schick merged commit 503379d into main May 1, 2023
@leo-schick leo-schick deleted the upgrade_bootstrap branch May 1, 2023 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants