Skip to content
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

feat(skin): IOS-9684 update design tokens from mistica-design branch: production #331

Merged
merged 5 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Build and Test
run: make test

- name: Extract Sceenshot diff from failed Tests
- name: Extract Screenshot diff from failed Tests
if: always()
run: make extract_tests_attachments

Expand Down
2 changes: 1 addition & 1 deletion Sources/Mistica/Components/Stepper/SegmentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extension SegmentView {
private extension SegmentView {
func commonInit() {
backgroundColor = .clear
backgroundView.backgroundColor = .control
backgroundView.backgroundColor = .barTrack
trackView.backgroundColor = .controlActivated

addSubview(backgroundView, constraints: [
Expand Down
6 changes: 6 additions & 0 deletions Sources/MisticaCommon/Colors/BlauColorPalette.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ struct BlauColors: MisticaColors {
let buttonDangerBackground = BlauColors.palette.blauRed
let buttonDangerBackgroundSelected = BlauColors.palette.blauRed70
let buttonDangerBackgroundHover = BlauColors.palette.blauRed70
let buttonLinkDangerBackgroundSelected = BlauColors.palette.blauRed10 | BlauColors.palette.blauPurple.withAlphaComponent(0.3)
let buttonLinkDangerBackgroundInverse = BlauColors.palette.white | BlauColors.palette.white.withAlphaComponent(0.01)
let buttonLinkDangerBackgroundInverseSelected = BlauColors.palette.blauRed10 | BlauColors.palette.blauPurple.withAlphaComponent(0.3)
let buttonLinkBackgroundSelected = BlauColors.palette.blauPurple10 | BlauColors.palette.blauPurple.withAlphaComponent(0.3)
let buttonLinkBackgroundInverseSelected = BlauColors.palette.white.withAlphaComponent(0.15) | BlauColors.palette.blauPurple.withAlphaComponent(0.3)
let buttonPrimaryBackground = BlauColors.palette.blauBlueSecondary
Expand Down Expand Up @@ -67,7 +70,10 @@ struct BlauColors: MisticaColors {
let textLinkSnackbar = BlauColors.palette.blauPurple30
let control = BlauColors.palette.grey2 | BlauColors.palette.darkModeGrey6
let controlActivated = BlauColors.palette.blauBlueSecondary
let controlInverse = BlauColors.palette.white | BlauColors.palette.darkModeGrey6
let controlActivatedInverse = BlauColors.palette.white | BlauColors.palette.blauBlueSecondary
let controlError = BlauColors.palette.blauRed
let barTrack = BlauColors.palette.grey2 | BlauColors.palette.darkModeGrey6
let loadingBar = BlauColors.palette.blauBlueSecondary | BlauColors.palette.blauBluePrimary
let loadingBarBackground = BlauColors.palette.blauBlueSecondary10 | BlauColors.palette.darkModeGrey
let toggleAndroidInactive = BlauColors.palette.grey2 | BlauColors.palette.grey5
Expand Down
Loading