Skip to content

Commit

Permalink
Fixup! CSS, conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Mikhail Sazanov <m@sazanof.ru>
  • Loading branch information
Mikhail Sazanov committed Nov 3, 2022
1 parent e3c36fa commit 2e97866
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions src/components/Outbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<!-- List -->
<template #list>
<div slot="list" class="header__button">
<NewMessageButtonHeader />
<div class="outbox-retry">
<div v-if="!sending" class="outbox-retry--info">
{{
Expand All @@ -47,15 +46,6 @@
@click="sendFailedMessages">
{{ t('mail', 'Retry') }}
</span>
<NcButton
class="outbox-retry--btn"
:title="t('mail', 'Send failed messages')"
:disabled="sending"
@click="sendFailedMessages">
<template #icon>
<EmailFastOutlineIcon :size="22" />
</template>
</NcButton>
</div>
<AppContentList>
<Error
Expand Down Expand Up @@ -85,7 +75,6 @@ import Error from './Error'
import EmptyMailbox from './EmptyMailbox'
import OutboxMessageContent from './OutboxMessageContent'
import OutboxMessageListItem from './OutboxMessageListItem'
import NewMessageButtonHeader from './NewMessageButtonHeader'
import logger from '../logger'

export default {
Expand All @@ -98,7 +87,6 @@ export default {
EmptyMailbox,
OutboxMessageListItem,
OutboxMessageContent,
NewMessageButtonHeader,
},
data() {
return {
Expand Down Expand Up @@ -208,6 +196,10 @@ export default {
align-items: center;
justify-content: space-between;
border-right: 1px solid var(--color-border);
min-height: 52px;
margin: 3px 0 0 52px;
border-right: 1px solid var(--color-border);
position: relative;

.outbox-retry--info {
margin: 4px;
Expand Down

0 comments on commit 2e97866

Please sign in to comment.