Skip to content

Commit 61ec157

Browse files
authored
Merge pull request moodlehq#4468 from crazyserver/MOBILE-3063
Mobile 3063
2 parents be9ff2d + 4f6c7cc commit 61ec157

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

src/addons/mod/bigbluebuttonbn/tests/behat/basic_usage.feature

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,5 +173,7 @@ Feature: Test basic usage of BBB activity in app
173173
When I press "Presentation" in the app
174174
And I press "OK" in the app
175175
And I switch to the browser tab opened by the app
176-
And I log in as "student1"
177-
Then I should see "The recording URL is invalid"
176+
# This part fails due to an issue in LSM.
177+
# @TODO Uncomment when MDL-85704 is solved
178+
# And I log in as "student1"
179+
# Then I should see "The recording URL is invalid"

src/core/directives/format-text.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncDirec
997997
protected addIframeHelp(iframe: HTMLIFrameElement): void {
998998
const helpDiv = document.createElement('div');
999999

1000-
helpDiv.classList.add('ion-text-center', 'ion-text-wrap');
1000+
helpDiv.classList.add('ion-text-center', 'ion-text-wrap', 'core-iframe-help');
10011001

10021002
const button = document.createElement('ion-button');
10031003
button.setAttribute('fill', 'clear');

src/core/directives/reading-mode.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class CoreReadingModeDirective implements AfterViewInit, OnDestroy {
6767
await this.addTextViewerButton();
6868
this.element.classList.add('core-reading-mode-ready');
6969

70-
this.enabled = document.body.classList.contains('core-reading-mode-enabled');
70+
this.enabled = document.body.classList.contains('core-reading-mode-enable-on-enter');
7171
if (this.enabled) {
7272
await this.enterReadingMode();
7373
}
@@ -136,6 +136,7 @@ export class CoreReadingModeDirective implements AfterViewInit, OnDestroy {
136136
await this.header?.setEnabled(false);
137137

138138
document.body.classList.add('core-reading-mode-enabled');
139+
document.body.classList.add('core-reading-mode-enable-on-enter');
139140

140141
const elements = document.body.querySelectorAll('[core-reading-mode].core-reading-mode-ready');
141142

@@ -185,6 +186,7 @@ export class CoreReadingModeDirective implements AfterViewInit, OnDestroy {
185186

186187
this.enabled = false;
187188
document.body.classList.remove('core-reading-mode-enabled');
189+
document.body.classList.remove('core-reading-mode-enable-on-enter');
188190

189191
// Enable all styles in element.
190192
this.disabledStyles.forEach((style) => {
@@ -236,6 +238,7 @@ export class CoreReadingModeDirective implements AfterViewInit, OnDestroy {
236238
this.viewportPromise?.cancel();
237239

238240
// Disable reading mode should be done by the user.
241+
document.body.classList.remove('core-reading-mode-enabled');
239242
}
240243

241244
}

src/theme/components/reading-mode.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,30 @@ body.core-reading-mode-enabled {
1212
&.core-reading-mode-theme-light {
1313
--reading-mode-background: #{$background-color};
1414
--reading-mode-text-color: #{$text-color};
15+
--reading-mode-link-color: var(--info);
1516
}
1617

1718
&.core-reading-mode-theme-dark {
1819
--reading-mode-background: #{$background-color-dark};
1920
--reading-mode-text-color: #{$text-color-dark};
21+
--reading-mode-link-color: var(--info-tint);
2022
}
2123

2224
&.core-reading-mode-theme-sepia {
2325
--reading-mode-background: var(--core-reading-mode-sepia-background);
2426
--reading-mode-text-color: var(--core-reading-mode-sepia-text-color);
27+
--reading-mode-link-color: var(--info);
2528
}
2629

2730
&.core-reading-mode-theme-hcm {
2831
--reading-mode-background: #000000;
2932
--reading-mode-text-color: #ffffff;
33+
--reading-mode-link-color: var(--info-tint);
3034
}
3135

3236
&.core-reading-mode-multimedia-hidden {
3337
ion-content.core-reading-mode-content {
34-
img, video, iframe {
38+
img, video, iframe, core-iframe, .core-iframe-help {
3539
display: none !important;
3640
}
3741
}
@@ -49,6 +53,7 @@ body.core-reading-mode-enabled {
4953
--color: var(--reading-mode-text-color, --text-color);
5054
--subdued-text-color: var(--text-color);
5155
--core-input-text: var(--text-color);
56+
--core-link-color: var(--reading-mode-link-color, --core-link-color);
5257
color: var(--text-color) !important;
5358
}
5459

0 commit comments

Comments
 (0)