HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
naskya 2023-09-20 10:21:39 +09:00
parent a1db0b053c
commit ede5b979fe
No known key found for this signature in database
GPG key ID: 164DFF24E2D40139
1 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
packages/client/src/ui/_common_/navbar.vue
View file

@ -596,39 +596,10 @@ function more(ev: MouseEvent) {
display: none;
}
<<<<<<< packages/client/src/ui/_common_/navbar.vue
> .indicator {
position: absolute;
top: 6px;
inset-inline-start: 24px;
color: var(--navIndicator);
font-size: 8px;
}
> .animateIndicator {
animation: blink 1s infinite;
}
}
.post {
width: 100%;
height: 52px;
margin-bottom: 16px;
&:before, &::after {
inset: 0;
margin: auto;
width: 52px;
aspect-ratio: 1/1;
}
> .icon {
inset-inline-start: unset;
}
> .text {
display: none;
=======
> .indicator {
position: absolute;
top: 6px;
left: 24px;
inset-inline-start: 24px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
@ -662,7 +633,6 @@ function more(ev: MouseEvent) {
}
}
}
>>>>>>> packages/client/src/ui/_common_/navbar.vue
}
}
}