-
Notifications
You must be signed in to change notification settings - Fork 111
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
wip: silverstripe 5 compatibility #777
Conversation
Had "you" rather than "to" to introduce the infinitive "to make".
…-fix Minor grammatical correction
…thub-actions MISC: Github actions setup updated, Travis setup removed.
…-github-action BUG: Github actions setup correction (linting)
…ed-code API Remove deprecated code
…pgrader MNT Remove legacy upgrader config
Make fluent CMS 5 compatible
// force ... to turn into actual title | ||
// @todo i18n this | ||
content: "Copy from" !important; | ||
content: "Copy from" !important;// sass-lint:disable-line no-important |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was a really ugly work-around because I couldn't update the button labels in react grid menu.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably worth adding that as a comment above it - it's always nice when looking at scss which has exceptions to see comments right there telling you why it's an exception.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it was '...' which is the default label for 'more actions'.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh that makes sense haha ignore me then, I just didn't understand that comment that was already there 😅
@@ -1,5 +1,5 @@ | |||
{ | |||
"name": "tractorcow/silverstripe-fluent", | |||
"name": "silverstripe/silverstripe-fluent", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was only added here so our fork could be installed under its own name.
"name": "silverstripe/silverstripe-fluent", | |
"name": "tractorcow/silverstripe-fluent", |
# WARNING | ||
|
||
This is a temporary fork of `tractorcow/silverstripe-fluent`. Do not install in production environment. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# WARNING | |
This is a temporary fork of `tractorcow/silverstripe-fluent`. Do not install in production environment. |
Requirements::javascript('silverstripe/silverstripe-fluent:client/dist/js/fluent.js'); | ||
Requirements::css("silverstripe/silverstripe-fluent:client/dist/styles/fluent.css"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Requirements::javascript('silverstripe/silverstripe-fluent:client/dist/js/fluent.js'); | |
Requirements::css("silverstripe/silverstripe-fluent:client/dist/styles/fluent.css"); | |
Requirements::javascript('tractorcow/silverstripe-fluent:client/dist/js/fluent.js'); | |
Requirements::css("tractorcow/silverstripe-fluent:client/dist/styles/fluent.css"); |
Requirements::javascript("silverstripe/silverstripe-fluent:client/dist/js/fluent.js"); | ||
Requirements::css("silverstripe/silverstripe-fluent:client/dist/styles/fluent.css"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Requirements::javascript("silverstripe/silverstripe-fluent:client/dist/js/fluent.js"); | |
Requirements::css("silverstripe/silverstripe-fluent:client/dist/styles/fluent.css"); | |
Requirements::javascript("tractorcow/silverstripe-fluent:client/dist/js/fluent.js"); | |
Requirements::css("tractorcow/silverstripe-fluent:client/dist/styles/fluent.css"); |
A lot of these commits are already in this repo - they should be merged up to master before this pr gets merged. |
Do you want me to change the source from |
No, |
@tractorcow if you can merge up the 6 branch to master (see master...6) then I'll update this PR with the recommended changes and we'll be able to get it merged. Ideally we would also have a |
I'll do this soon. I will make a 7 branch once we tag our first 7.0.0 |
Completed. |
Sweet, thank you. I'll update the PR in a moment |
I've opted to open a new PR, since I can't amend this one and didn't want to affect our current CI by making changes to the fork used in the beta |
Replaced with #779 |
This is just a preview PR to be replaced once the current WIP is ready to merge.