Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/mustakshif/Asri into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mustakshif committed Apr 20, 2024
2 parents 87b0181 + bac2a27 commit bc4c69b
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 17 deletions.
23 changes: 19 additions & 4 deletions style/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,13 @@ $theme-light: (
font-background11:#FFE4FF,
font-background12:#FFE0F5,
font-background13:#FFE2D7,
pdf-background1: #FFC3D3,
pdf-background2: #FFD18D,
pdf-background3: #FDE57A,
pdf-background4: #A7FDB4,
pdf-background5: #A3F4FF,
pdf-background6: #BDE2FF,
pdf-background7: #FFC9FF,
inline-link-color: #4285f4,
inline-mark-background: rgb(168, 251, 172),
light-components:#fff
Expand Down Expand Up @@ -377,6 +384,13 @@ $theme-dark: (
font-background11:#54345D,
font-background12:#632E46,
font-background13:#663028,
pdf-background1: #9F3D53,
pdf-background2: #935000,
pdf-background3: #786100,
pdf-background4: #1C7736,
pdf-background5: #14707A,
pdf-background6: #415EAC,
pdf-background7: #814893,
inline-link-color: #8ab4f8,
inline-mark-background: #00d95964,
light-components:#e0e0e0,
Expand Down Expand Up @@ -449,11 +463,12 @@ $theme-dark: (
--b3-font-color#{$i}: #{$font-color};

--b3-font-background#{$i}:#{$font-background};
}

;
};

--b3-font-color5: var(--b3-card-warning-color);
@for $i from 1 through 7 {
$pdf-background: map-get($theme-map, pdf-background#{$i});
--b3-pdf-background#{$i}: #{$pdf-background};
}

/* 所见即所得行内元素颜色 */
--b3-protyle-inline-link-color: #{map-get($theme-map,inline-link-color)};
Expand Down
12 changes: 6 additions & 6 deletions style/components/dialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -665,11 +665,11 @@
}

// 有统一更新时的插件开关
&:not(:empty)~.config-bazaar__title {
.b3-switch {
transform: translateX(-20px);
}
}
// &:not(:empty)~.config-bazaar__title {
// .b3-switch {
// transform: translateX(-20px);
// }
// }
}

// 已下载卡片容器
Expand Down Expand Up @@ -813,7 +813,7 @@
}

#configBazaarReadme {
transition: transform $timing-function-accelerate 0.2s, filter linear 0.2s;
transition: transform $timing-function-accelerate 0.2s;
opacity: 1;
z-index: 2;
padding: 0;
Expand Down
12 changes: 6 additions & 6 deletions style/features/blur.scss
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,13 @@ body:not(.body--blur, .asri-disable-backdrop-blur) {
}
}

.config-bazaar__readme {
filter: saturate(0);
// .config-bazaar__readme {
// filter: saturate(0);

&--show {
filter: none;
}
}
// &--show {
// filter: none;
// }
// }

.tooltip {
background-color: oklch(from var(--b3-menu-background) l c h / $medium-transparency);
Expand Down
6 changes: 5 additions & 1 deletion theme.css

Large diffs are not rendered by default.

0 comments on commit bc4c69b

Please sign in to comment.