Skip to content

Commit ec0a6ab

Browse files
authored
Merge pull request moodlehq#4470 from crazyserver/MOBILE-4653
MOBILE-4653 style: Improve capture media button on dark mode
2 parents 61ec157 + f470ffd commit ec0a6ab

File tree

7 files changed

+20
-14
lines changed

7 files changed

+20
-14
lines changed

src/core/features/emulator/components/capture-media/capture-media.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1 *ngIf="title">{{ title | translate }}</h1>
2929
</core-loading>
3030
</ion-content>
3131

32-
<ion-footer *ngIf="readyToCapture">
32+
<ion-footer *ngIf="readyToCapture" class="gray-with-border">
3333
<ion-row>
3434
<ion-col />
3535
<ion-col class="ion-text-center">

src/core/features/emulator/components/capture-media/capture-media.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,4 @@
3737
}
3838
}
3939
}
40-
41-
ion-footer {
42-
background-color: var(--gray-300);
43-
border-top: 1px solid var(--gray-500);
44-
}
4540
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ion-footer {
2+
background-color: var(--contrast-background);
3+
4+
> ion-toolbar:only-child {
5+
top: 1px;
6+
}
7+
8+
&.gray-with-border {
9+
background-color: var(--core-footer-gray-background);
10+
border-top: 1px solid var(--core-footer-gray-border);
11+
}
12+
}

src/theme/components/ionic.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@import "ion-content.scss";
1212
@import "ion-datetime.scss";
1313
@import "ion-fab.scss";
14+
@import "ion-footer.scss";
1415
@import "ion-header.scss";
1516
@import "ion-icon.scss";
1617
@import "ion-input.scss";

src/theme/theme.base.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ ion-tabs.hide-header ion-header {
108108
display: none;
109109
}
110110

111-
ion-footer {
112-
background-color: var(--contrast-background);
113-
114-
> ion-toolbar:only-child {
115-
top: 1px;
116-
}
117-
}
118-
119111
// Ionic list.
120112
ion-list {
121113
padding: 0 !important;

src/theme/theme.dark.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@
111111
--core-header-toolbar-color: var(--text-color);
112112
--core-header-toolbar-border-color: var(--stroke);
113113

114+
--core-footer-gray-background: var(--gray-700);
115+
--core-footer-gray-border: var(--gray-600);
116+
114117
--core-tabs-background: var(--gray-900);
115118
--core-tab-background: var(--core-tabs-background);
116119
--core-tab-color: var(--subdued-text-color);

src/theme/theme.light.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
--core-header-buttons-background: transparent;
119119
--core-header-buttons-color: var(--core-header-toolbar-color);
120120

121+
--core-footer-gray-background: var(--gray-300);
122+
--core-footer-gray-border: var(--gray-500);
123+
121124
--ion-searchbar-background: var(--ion-background-color);
122125
--ion-searchbar-border-color: var(--core-input-stroke);
123126
--ion-searchbar-color: var(--text-color);

0 commit comments

Comments
 (0)