-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Migrate to full css-variables theming with IThemes provider #31751
Conversation
4e7baba
to
52ccbfa
Compare
151e468
to
dd7a568
Compare
d395ec6
to
11066e8
Compare
Signed-off-by: Joas Schilling <[email protected]>
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
29a0abb
to
38e99e3
Compare
2f073df
to
a5c4ce3
Compare
This comment was marked as resolved.
This comment was marked as resolved.
I'll retest in a second 👍 |
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.
We should add this to breaking change of 25 (e.g. that the accessibility app is now included in theming...) |
Will do! 🚀 |
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.
Will address design improvements in followups
Signed-off-by: John Molakvoæ <[email protected]>
b19bd46
to
850d8ac
Compare
integration-setup-features failure unrelated |
@skjnldsv Did you find a fix for the dyslexic prpblem? |
Yes, will add as followup, just using the generateUrl should be enough diff --git a/apps/theming/lib/Themes/DyslexiaFont.php b/apps/theming/lib/Themes/DyslexiaFont.php
index 50284d33b9..2629ac588c 100644
--- a/apps/theming/lib/Themes/DyslexiaFont.php
+++ b/apps/theming/lib/Themes/DyslexiaFont.php
@@ -60,23 +60,30 @@ class DyslexiaFont extends DefaultTheme implements ITheme {
}
public function getCustomCss(): string {
+ $fontPathWoff = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.woff');
+ $fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf');
+ $fontPathTtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.ttf');
+ $boldFontPathWoff = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.woff');
+ $boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf');
+ $boldFontPathTtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.ttf');
+
return "
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
font-weight: 400;
- src: url('../fonts/OpenDyslexic-Regular.woff') format('woff'),
- url('../fonts/OpenDyslexic-Regular.otf') format('opentype'),
- url('../fonts/OpenDyslexic-Regular.ttf') format('truetype');
+ src: url('$fontPathWoff') format('woff'),
+ url('$fontPathOtf') format('opentype'),
+ url('$fontPathTtf') format('truetype');
}
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
font-weight: 700;
- src: url('../fonts/OpenDyslexic-Bold.woff') format('woff'),
- url('../fonts/OpenDyslexic-Bold.otf') format('opentype'),
- url('../fonts/OpenDyslexic-Bold.ttf') format('truetype');
+ src: url('$boldFontPathWoff') format('woff'),
+ url('$boldFontPathOtf') format('opentype'),
+ url('$boldFontPathTtf') format('truetype');
}
";
}
|
@skjnldsv something to look into it next week, but I think this broke one integration test |
I wondered this too, but I cannot reproduce locally 🤔 |
Is it possible to declare sccs in a Vue template ? |
Yes, we use scss in vue apps almost everywhere :) |
This is a first start towards a proper theme management system.
That should help us do the following:
Steps
ITheme
provider (private for now)How to review
Follow-ups
--background-invert-if-bright
=> invert the element if the main background colour is bright--primary-invert-if-bright
=> invert the element if the primary colour is too brightCloses #31746