Skip to content

MOBILE-3268 styles: Add darkmode to modals #2247

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 22, 2020
Merged

MOBILE-3268 styles: Add darkmode to modals #2247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/app/app.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ ion-app.app-root.md {
.action-sheet-title,
.action-sheet-container > .action-sheet-group:first-child {
box-shadow: 0 3px 5px $gray;
@include darkmode() {
box-shadow: 0 3px 5px $black;
}
}

.action-sheet-title {
Expand Down
3 changes: 3 additions & 0 deletions src/app/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,9 @@ ion-app.app-root {
.action-sheet-wrapper {
.action-sheet-button.action-sheet-cancel {
color: $core-action-sheet-cancel-color;
@include darkmode() {
color: $core-dark-action-sheet-cancel-color;
}
}
.action-sheet-selected {
color: $core-color;
Expand Down
181 changes: 101 additions & 80 deletions src/theme/dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,109 +16,130 @@ $core-dark-login-item-background-color: $core-dark-login-box-background-color !d
$core-dark-login-button-outline: $core-login-button-outline !default;
$core-dark-login-loading-color: $core-dark-text-color !default;

ion-app.app-root .ion-page {
ion-app.app-root {
@include darkmode() {
color: $core-dark-text-color;
background-color: $core-dark-item-bg-color;
ion-action-sheet .action-sheet-container .action-sheet-group .action-sheet-button {
color: $core-dark-text-color;

a:not(.button) {
color: $core-dark-link-color;
&.action-sheet-selected {
color: $core-color;
}
&.activated {
background-color: $black;
}
}

.core-tabs-bar,
.core-tabs-bar *,
.core-tabs-bar .tab-slide,
.ion-page,
.item,
.item-select,
ion-card,
.card-header,
.card-content {
ion-popover .popover-content,
ion-alert .alert-wrapper,
ion-action-sheet .action-sheet-container .action-sheet-group,
ion-loading .loading-wrapper {
color: $core-dark-text-color;
background-color: $core-dark-item-bg-color;

a:not(.button) {
color: $core-dark-link-color;
}

.alert-message {
color: $core-dark-text-color;
background-color: $core-dark-item-bg-color;
}

h1, h2, h3, h4, h5, h6,
ion-icon,
.label {
.core-tabs-bar,
.core-tabs-bar *,
.core-tabs-bar .tab-slide,
.ion-page,
.item,
.item-select,
ion-card,
.card-header,
.card-content {
color: $core-dark-text-color;
}
background-color: $core-dark-item-bg-color;

@each $color-name, $color-base, $color-contrast in get-colors($colors-dark) {
.icon-md-#{$color-name},
.icon-ios-#{$color-name},
.icon-wp-#{$color-name} {
color: $color-base;
h1, h2, h3, h4, h5, h6,
ion-icon,
.label {
color: $core-dark-text-color;
}
}
p {
color: $core-dark-text-secondary-color;
}
}

.item-divider,
.item-divider .item-inner {
color: $core-dark-text-color;
background-color: $core-dark-item-divider-bg-color;
}
@each $color-name, $color-base, $color-contrast in get-colors($colors-dark) {
.icon-md-#{$color-name},
.icon-ios-#{$color-name},
.icon-wp-#{$color-name} {
color: $color-base;
}
}
p {
color: $core-dark-text-secondary-color;
}
}

.item.item-ios:active,
.item.item-ios.activated,
.item.item-md:active,
.item.item-md.activated,
.item.item-wp:active,
.item.item-wp.activated {
background-color: $core-dark-background-color;
}
.item-divider,
.item-divider .item-inner {
color: $core-dark-text-color;
background-color: $core-dark-item-divider-bg-color;
}

.content,
.content-md,
.content-ios,
.content-wp {
color: $core-dark-text-color;
background-color: $core-dark-background-color;
}
.item.item-ios:active,
.item.item-ios.activated,
.item.item-md:active,
.item.item-md.activated,
.item.item-wp:active,
.item.item-wp.activated {
background-color: $core-dark-background-color;
}

.button,
.button-md-light,
.button-ios-light,
.button-wp-light,
.button-outline {
ion-icon {
color: inherit;
.content,
.content-md,
.content-ios,
.content-wp {
color: $core-dark-text-color;
background-color: $core-dark-background-color;
}
}

.toolbar-md-light .toolbar-background,
.toolbar-ios-light .toolbar-background,
.toolbar-wp-light .toolbar-background {
background-color: $core-dark-item-divider-bg-color;
color: $core-dark-text-color;
}
.button,
.button-md-light,
.button-ios-light,
.button-wp-light,
.button-outline {
ion-icon {
color: inherit;
}
}

.button.button-clear-md-dark,
.button.button-clear-ios-dark,
.button.button-clear-wp-dark {
.button-inner ion-icon {
.toolbar-md-light .toolbar-background,
.toolbar-ios-light .toolbar-background,
.toolbar-wp-light .toolbar-background {
background-color: $core-dark-item-divider-bg-color;
color: $core-dark-text-color;
}
}

.button-outline {
background-color: $core-dark-item-bg-color;
}
.button.button-clear-md-dark,
.button.button-clear-ios-dark,
.button.button-clear-wp-dark {
.button-inner ion-icon {
color: $core-dark-text-color;
}
}

ion-refresher {
.refresher-pulling-icon,
.refresher-refreshing-icon,
.refresher-pulling-icon ion-icon,
.refresher-refreshing-icon ion-icon,
ion-icon {
color: $refresher-icon-color;
.button-outline {
background-color: $core-dark-item-bg-color;
}

.refresher-pulling-text,
.refresher-refreshing-text {
color: $core-dark-text-color;
ion-refresher {
.refresher-pulling-icon,
.refresher-refreshing-icon,
.refresher-pulling-icon ion-icon,
.refresher-refreshing-icon ion-icon,
ion-icon {
color: $refresher-icon-color;
}

.refresher-pulling-text,
.refresher-refreshing-text {
color: $core-dark-text-color;
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/theme/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ $core-login-item-background-color: $white !default;

$core-action-sheet-color: $core-color !default;
$core-action-sheet-cancel-color: $danger !default;
$core-dark-action-sheet-cancel-color: $danger-dark !default;

// App iOS Variables
// --------------------------------------------------
Expand Down