Skip to content

Commit

Permalink
Merge branch 'issue-170-上_sentry' of https://github.com/MarleneJiang/…
Browse files Browse the repository at this point in the history
…ByteDream-JueJin into issue-170-上_sentry
  • Loading branch information
camera-2018 committed Feb 5, 2023
2 parents 177525d + 0338a66 commit cc95c22
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
11 changes: 6 additions & 5 deletions frontend/components/Aside/Advertisements.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ const turn_off = (i: number) => {
<nuxt-img class="ad" :src="i.img" />
<div i-carbon-close class="ad_close group-hover:opacity-50" @click="turn_off(parseInt(index))" />
<div class="txt_container">
<div class="txt">
广告
<div class="txt group/txt">
<span class="hidden group-hover/txt:inline">投放 </span>
<span>广告</span>
</div>
</div>
</div>
Expand All @@ -33,7 +34,7 @@ const turn_off = (i: number) => {

<style scoped>
.ad_container {
@apply flex flex-row justify-end gap-2
@apply flex flex-row justify-end gap-2 cursor-pointer
}
.ad {
Expand All @@ -42,8 +43,8 @@ const turn_off = (i: number) => {
.ad_close {
@apply my-2 mx-1 absolute
@apply text-jj_thirdly opacity-0 text-[1.5rem]
@apply font-[1500] hover:opacity-100
@apply text-link opacity-0 text-[1.5rem]
@apply font-[1500] hover:opacity-100 cursor-pointer
}
.txt_container {
Expand Down
14 changes: 9 additions & 5 deletions frontend/components/Aside/SuspensionPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const to_top = () => {
class="to_top_btn hover:shadow-md"
@click="to_top"
>
<div>
<div
title="回到顶部"
>
<svg
width="16"
height="16"
Expand All @@ -33,7 +35,9 @@ const to_top = () => {
</div>
</div>
<div class="to_top_btn hover:shadow-md">
<div>
<div
title="建议反馈"
>
<svg
width="16"
height="16"
Expand All @@ -55,12 +59,12 @@ const to_top = () => {

<style scoped>
.suspension_panel_container {
@apply block
@apply block cursor-pointer
@apply p-5 flex flex-col
}
.to_top_btn {
@apply my-2 bg-jj_font_white p-4 rounded-full shadow
@apply dark:bg-dark_bg dark:shadow-light-50
@apply my-2 bg-jj_font_white p-4 rounded-full shadow-[0_2px_8px_rgba(50,50,50,0.04)]
@apply dark:bg-dark_bg dark:drop-shadow-[0_2px_8px_rgba(255,255,255,0.15)]
}
</style>

0 comments on commit cc95c22

Please sign in to comment.